[PATCH] libata: rename ata_dev_id_[c_]string()
This patch renames ata_dev_id_[c_]string() to ata_id_[c_]string(). All other functions which read data from ATA ID data start with ata_id and those two function names were getting too long. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
parent
5b2ffed906
commit
6a62a04d47
@ -486,7 +486,7 @@ ata_dev_try_classify(struct ata_port *ap, unsigned int device, u8 *r_err)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ata_dev_id_string - Convert IDENTIFY DEVICE page into string
|
* ata_id_string - Convert IDENTIFY DEVICE page into string
|
||||||
* @id: IDENTIFY DEVICE results we will examine
|
* @id: IDENTIFY DEVICE results we will examine
|
||||||
* @s: string into which data is output
|
* @s: string into which data is output
|
||||||
* @ofs: offset into identify device page
|
* @ofs: offset into identify device page
|
||||||
@ -500,8 +500,8 @@ ata_dev_try_classify(struct ata_port *ap, unsigned int device, u8 *r_err)
|
|||||||
* caller.
|
* caller.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void ata_dev_id_string(const u16 *id, unsigned char *s,
|
void ata_id_string(const u16 *id, unsigned char *s,
|
||||||
unsigned int ofs, unsigned int len)
|
unsigned int ofs, unsigned int len)
|
||||||
{
|
{
|
||||||
unsigned int c;
|
unsigned int c;
|
||||||
|
|
||||||
@ -520,27 +520,27 @@ void ata_dev_id_string(const u16 *id, unsigned char *s,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ata_dev_id_c_string - Convert IDENTIFY DEVICE page into C string
|
* ata_id_c_string - Convert IDENTIFY DEVICE page into C string
|
||||||
* @id: IDENTIFY DEVICE results we will examine
|
* @id: IDENTIFY DEVICE results we will examine
|
||||||
* @s: string into which data is output
|
* @s: string into which data is output
|
||||||
* @ofs: offset into identify device page
|
* @ofs: offset into identify device page
|
||||||
* @len: length of string to return. must be an odd number.
|
* @len: length of string to return. must be an odd number.
|
||||||
*
|
*
|
||||||
* This function is identical to ata_dev_id_string except that it
|
* This function is identical to ata_id_string except that it
|
||||||
* trims trailing spaces and terminates the resulting string with
|
* trims trailing spaces and terminates the resulting string with
|
||||||
* null. @len must be actual maximum length (even number) + 1.
|
* null. @len must be actual maximum length (even number) + 1.
|
||||||
*
|
*
|
||||||
* LOCKING:
|
* LOCKING:
|
||||||
* caller.
|
* caller.
|
||||||
*/
|
*/
|
||||||
void ata_dev_id_c_string(const u16 *id, unsigned char *s,
|
void ata_id_c_string(const u16 *id, unsigned char *s,
|
||||||
unsigned int ofs, unsigned int len)
|
unsigned int ofs, unsigned int len)
|
||||||
{
|
{
|
||||||
unsigned char *p;
|
unsigned char *p;
|
||||||
|
|
||||||
WARN_ON(!(len & 1));
|
WARN_ON(!(len & 1));
|
||||||
|
|
||||||
ata_dev_id_string(id, s, ofs, len - 1);
|
ata_id_string(id, s, ofs, len - 1);
|
||||||
|
|
||||||
p = s + strnlen(s, len - 1);
|
p = s + strnlen(s, len - 1);
|
||||||
while (p > s && p[-1] == ' ')
|
while (p > s && p[-1] == ' ')
|
||||||
@ -2315,8 +2315,7 @@ static int ata_dma_blacklisted(const struct ata_device *dev)
|
|||||||
unsigned char model_num[41];
|
unsigned char model_num[41];
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
ata_dev_id_c_string(dev->id, model_num, ATA_ID_PROD_OFS,
|
ata_id_c_string(dev->id, model_num, ATA_ID_PROD_OFS, sizeof(model_num));
|
||||||
sizeof(model_num));
|
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(ata_dma_blacklist); i++)
|
for (i = 0; i < ARRAY_SIZE(ata_dma_blacklist); i++)
|
||||||
if (!strcmp(ata_dma_blacklist[i], model_num))
|
if (!strcmp(ata_dma_blacklist[i], model_num))
|
||||||
@ -4934,8 +4933,8 @@ EXPORT_SYMBOL_GPL(ata_scsi_slave_config);
|
|||||||
EXPORT_SYMBOL_GPL(ata_scsi_release);
|
EXPORT_SYMBOL_GPL(ata_scsi_release);
|
||||||
EXPORT_SYMBOL_GPL(ata_host_intr);
|
EXPORT_SYMBOL_GPL(ata_host_intr);
|
||||||
EXPORT_SYMBOL_GPL(ata_dev_classify);
|
EXPORT_SYMBOL_GPL(ata_dev_classify);
|
||||||
EXPORT_SYMBOL_GPL(ata_dev_id_string);
|
EXPORT_SYMBOL_GPL(ata_id_string);
|
||||||
EXPORT_SYMBOL_GPL(ata_dev_id_c_string);
|
EXPORT_SYMBOL_GPL(ata_id_c_string);
|
||||||
EXPORT_SYMBOL_GPL(ata_dev_config);
|
EXPORT_SYMBOL_GPL(ata_dev_config);
|
||||||
EXPORT_SYMBOL_GPL(ata_scsi_simulate);
|
EXPORT_SYMBOL_GPL(ata_scsi_simulate);
|
||||||
EXPORT_SYMBOL_GPL(ata_eh_qc_complete);
|
EXPORT_SYMBOL_GPL(ata_eh_qc_complete);
|
||||||
|
@ -1567,8 +1567,8 @@ unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf,
|
|||||||
|
|
||||||
if (buflen > 35) {
|
if (buflen > 35) {
|
||||||
memcpy(&rbuf[8], "ATA ", 8);
|
memcpy(&rbuf[8], "ATA ", 8);
|
||||||
ata_dev_id_string(args->id, &rbuf[16], ATA_ID_PROD_OFS, 16);
|
ata_id_string(args->id, &rbuf[16], ATA_ID_PROD_OFS, 16);
|
||||||
ata_dev_id_string(args->id, &rbuf[32], ATA_ID_FW_REV_OFS, 4);
|
ata_id_string(args->id, &rbuf[32], ATA_ID_FW_REV_OFS, 4);
|
||||||
if (rbuf[32] == 0 || rbuf[32] == ' ')
|
if (rbuf[32] == 0 || rbuf[32] == ' ')
|
||||||
memcpy(&rbuf[32], "n/a ", 4);
|
memcpy(&rbuf[32], "n/a ", 4);
|
||||||
}
|
}
|
||||||
@ -1642,8 +1642,8 @@ unsigned int ata_scsiop_inq_80(struct ata_scsi_args *args, u8 *rbuf,
|
|||||||
memcpy(rbuf, hdr, sizeof(hdr));
|
memcpy(rbuf, hdr, sizeof(hdr));
|
||||||
|
|
||||||
if (buflen > (ATA_SERNO_LEN + 4 - 1))
|
if (buflen > (ATA_SERNO_LEN + 4 - 1))
|
||||||
ata_dev_id_string(args->id, (unsigned char *) &rbuf[4],
|
ata_id_string(args->id, (unsigned char *) &rbuf[4],
|
||||||
ATA_ID_SERNO_OFS, ATA_SERNO_LEN);
|
ATA_ID_SERNO_OFS, ATA_SERNO_LEN);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -1806,8 +1806,8 @@ static int ata_dev_supports_fua(u16 *id)
|
|||||||
if (!ata_id_has_fua(id))
|
if (!ata_id_has_fua(id))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
ata_dev_id_c_string(id, model, ATA_ID_PROD_OFS, sizeof(model));
|
ata_id_c_string(id, model, ATA_ID_PROD_OFS, sizeof(model));
|
||||||
ata_dev_id_c_string(id, fw, ATA_ID_FW_REV_OFS, sizeof(fw));
|
ata_id_c_string(id, fw, ATA_ID_FW_REV_OFS, sizeof(fw));
|
||||||
|
|
||||||
if (strcmp(model, "Maxtor"))
|
if (strcmp(model, "Maxtor"))
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -338,8 +338,7 @@ static void sil_dev_config(struct ata_port *ap, struct ata_device *dev)
|
|||||||
unsigned int n, quirks = 0;
|
unsigned int n, quirks = 0;
|
||||||
unsigned char model_num[41];
|
unsigned char model_num[41];
|
||||||
|
|
||||||
ata_dev_id_c_string(dev->id, model_num, ATA_ID_PROD_OFS,
|
ata_id_c_string(dev->id, model_num, ATA_ID_PROD_OFS, sizeof(model_num));
|
||||||
sizeof(model_num));
|
|
||||||
|
|
||||||
for (n = 0; sil_blacklist[n].product; n++)
|
for (n = 0; sil_blacklist[n].product; n++)
|
||||||
if (!strcmp(sil_blacklist[n].product, model_num)) {
|
if (!strcmp(sil_blacklist[n].product, model_num)) {
|
||||||
|
@ -538,10 +538,10 @@ extern void ata_sg_init_one(struct ata_queued_cmd *qc, void *buf,
|
|||||||
extern void ata_sg_init(struct ata_queued_cmd *qc, struct scatterlist *sg,
|
extern void ata_sg_init(struct ata_queued_cmd *qc, struct scatterlist *sg,
|
||||||
unsigned int n_elem);
|
unsigned int n_elem);
|
||||||
extern unsigned int ata_dev_classify(const struct ata_taskfile *tf);
|
extern unsigned int ata_dev_classify(const struct ata_taskfile *tf);
|
||||||
extern void ata_dev_id_string(const u16 *id, unsigned char *s,
|
extern void ata_id_string(const u16 *id, unsigned char *s,
|
||||||
unsigned int ofs, unsigned int len);
|
unsigned int ofs, unsigned int len);
|
||||||
extern void ata_dev_id_c_string(const u16 *id, unsigned char *s,
|
extern void ata_id_c_string(const u16 *id, unsigned char *s,
|
||||||
unsigned int ofs, unsigned int len);
|
unsigned int ofs, unsigned int len);
|
||||||
extern void ata_dev_config(struct ata_port *ap, unsigned int i);
|
extern void ata_dev_config(struct ata_port *ap, unsigned int i);
|
||||||
extern void ata_bmdma_setup (struct ata_queued_cmd *qc);
|
extern void ata_bmdma_setup (struct ata_queued_cmd *qc);
|
||||||
extern void ata_bmdma_start (struct ata_queued_cmd *qc);
|
extern void ata_bmdma_start (struct ata_queued_cmd *qc);
|
||||||
|
Loading…
Reference in New Issue
Block a user