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>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index 2035417fc1ab..76e386043dcd 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -153,11 +153,11 @@ static void ali_early_error_handler(struct ata_port *ap)
 
 static unsigned long ali_20_filter(const struct ata_port *ap, struct ata_device *adev, unsigned long mask)
 {
-        char model_num[40];
+        char model_num[ATA_ID_PROD_LEN];
         /* No DMA on anything but a disk for now */
         if (adev->class != ATA_DEV_ATA)
                 mask &= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA);
-        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));
         if (strstr(model_num, "WDC"))
                 return mask &= ~ATA_MASK_UDMA;
         return ata_pci_default_filter(ap, adev, mask);