diff options
| author | Tejun Heo <htejun@gmail.com> | 2007-01-02 20:18:49 +0900 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-09 17:39:30 -0500 |
| commit | a0cf733b333eeeafb7324e2897448006c693c26c (patch) | |
| tree | 9a08b3e197cf4d1d17c39ed93cbcdd26fd722316 /drivers/ata/pata_serverworks.c | |
| parent | cdf56bcf14b9d441777703eef95eef807e4136ec (diff) | |
| download | kernel-common-a0cf733b333eeeafb7324e2897448006c693c26c.tar.gz kernel-common-a0cf733b333eeeafb7324e2897448006c693c26c.tar.bz2 kernel-common-a0cf733b333eeeafb7324e2897448006c693c26c.zip | |
libata: straighten out ATA_ID_* constants
* Kill _OFS suffixes in ATA_ID_{SERNO|FW_REV|PROD}_OFS for consistency
with other ATA_ID_* constants.
* Kill ATA_SERNO_LEN
* Add and use ATA_ID_SERNO_LEN, ATA_ID_FW_REV_LEN and ATA_ID_PROD_LEN.
This change also makes ata_device_blacklisted() use proper length
for fwrev.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/pata_serverworks.c')
| -rw-r--r-- | drivers/ata/pata_serverworks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c index 80191978d481..bf9452728d19 100644 --- a/drivers/ata/pata_serverworks.c +++ b/drivers/ata/pata_serverworks.c @@ -218,7 +218,7 @@ static unsigned long serverworks_osb4_filter(const struct ata_port *ap, struct a static unsigned long serverworks_csb_filter(const struct ata_port *ap, struct ata_device *adev, unsigned long mask) { const char *p; - char model_num[40]; + char model_num[ATA_ID_PROD_LEN]; int len, i; /* Disk, UDMA */ @@ -226,7 +226,7 @@ static unsigned long serverworks_csb_filter(const struct ata_port *ap, struct at return ata_pci_default_filter(ap, adev, mask); /* Actually do need to check */ - ata_id_string(adev->id, model_num, ATA_ID_PROD_OFS, sizeof(model_num)); + ata_id_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num)); /* Precuationary - why not do this in the libata core ?? */ len = strlen(model_num); |