6 files changed, 23 insertions, 78 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 7d4b002568e7..a03019c40ac4 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -3325,35 +3325,20 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         { }
 };
 
-static int ata_strim(char *s, size_t len)
-{
-        len = strnlen(s, len);
-
-        /* ATAPI specifies that empty space is blank-filled; remove blanks */
-        while ((len > 0) && (s[len - 1] == ' ')) {
-                len--;
-                s[len] = 0;
-        }
-        return len;
-}
-
 unsigned long ata_device_blacklisted(const struct ata_device *dev)
 {
-        unsigned char model_num[ATA_ID_PROD_LEN];
-        unsigned char model_rev[ATA_ID_FW_REV_LEN];
-        unsigned int nlen, rlen;
+        unsigned char model_num[ATA_ID_PROD_LEN + 1];
+        unsigned char model_rev[ATA_ID_FW_REV_LEN + 1];
         const struct ata_blacklist_entry *ad = ata_device_blacklist;
 
-        ata_id_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));
-        ata_id_string(dev->id, model_rev, ATA_ID_FW_REV, sizeof(model_rev));
-        nlen = ata_strim(model_num, sizeof(model_num));
-        rlen = ata_strim(model_rev, sizeof(model_rev));
+        ata_id_c_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));
+        ata_id_c_string(dev->id, model_rev, ATA_ID_FW_REV, sizeof(model_rev));
 
         while (ad->model_num) {
-                if (!strncmp(ad->model_num, model_num, nlen)) {
+                if (!strcmp(ad->model_num, model_num)) {
                         if (ad->model_rev == NULL)
                                 return ad->horkage;
-                        if (!strncmp(ad->model_rev, model_rev, rlen))
+                        if (!strcmp(ad->model_rev, model_rev))
                                 return ad->horkage;
                 }
                 ad++;
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index 76e386043dcd..fde5ce9f7eae 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[ATA_ID_PROD_LEN];
+        char model_num[ATA_ID_PROD_LEN + 1];
         /* 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, sizeof(model_num));
+        ata_id_c_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);
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
index 81deb2c3824c..2202c7ec16e3 100644
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
@@ -151,23 +151,13 @@ static const char *bad_ata66_3[] = {
 
 static int hpt_dma_blacklisted(const struct ata_device *dev, char *modestr, const char *list[])
 {
-        unsigned char model_num[ATA_ID_PROD_LEN];
-        char *s;
-        unsigned int len;
+        unsigned char model_num[ATA_ID_PROD_LEN + 1];
         int i = 0;
 
-        ata_id_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));
-        s = &model_num[0];
-        len = strnlen(s, sizeof(model_num));
+        ata_id_c_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));
 
-        /* ATAPI specifies that empty space is blank-filled; remove blanks */
-        while ((len > 0) && (s[len - 1] == ' ')) {
-                len--;
-                s[len] = 0;
-        }
-
-        while(list[i] != NULL) {
-                if (!strncmp(list[i], s, len)) {
+        while (list[i] != NULL) {
+                if (!strcmp(list[i], model_num)) {
                         printk(KERN_WARNING DRV_NAME ": %s is not supported for %s.\n",
                                 modestr, list[i]);
                         return 1;
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index ff767755e98b..9e1eb473c0a1 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -349,23 +349,13 @@ static u32 hpt37x_find_mode(struct ata_port *ap, int speed)
 
 static int hpt_dma_blacklisted(const struct ata_device *dev, char *modestr, const char *list[])
 {
-        unsigned char model_num[ATA_ID_PROD_LEN];
-        char *s;
-        unsigned int len;
+        unsigned char model_num[ATA_ID_PROD_LEN + 1];
         int i = 0;
 
-        ata_id_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));
-        s = &model_num[0];
-        len = strnlen(s, sizeof(model_num));
+        ata_id_c_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));
 
-        /* ATAPI specifies that empty space is blank-filled; remove blanks */
-        while ((len > 0) && (s[len - 1] == ' ')) {
-                len--;
-                s[len] = 0;
-        }
-
-        while(list[i] != NULL) {
-                if (!strncmp(list[i], s, len)) {
+        while (list[i] != NULL) {
+                if (!strcmp(list[i], model_num)) {
                         printk(KERN_WARNING DRV_NAME ": %s is not supported for %s.\n",
                                 modestr, list[i]);
                         return 1;
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index c84dfaede89c..171fbd206bd5 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -531,22 +531,9 @@ static int it821x_smart_set_mode(struct ata_port *ap, struct ata_device **unused
 
 static void it821x_dev_config(struct ata_port *ap, struct ata_device *adev)
 {
-        unsigned char model_num[ATA_ID_PROD_LEN];
-        char *s;
-        unsigned int len;
+        unsigned char model_num[ATA_ID_PROD_LEN + 1];
 
-        /* This block ought to be a library routine as it is in several
-           drivers now */
-
-        ata_id_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num));
-        s = &model_num[0];
-        len = strnlen(s, sizeof(model_num));
-
-        /* ATAPI specifies that empty space is blank-filled; remove blanks */
-        while ((len > 0) && (s[len - 1] == ' ')) {
-                len--;
-                s[len] = 0;
-        }
+        ata_id_c_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num));
 
         if (adev->max_sectors > 255)
                 adev->max_sectors = 255;
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index bf9452728d19..4b8c2352cdca 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -218,25 +218,18 @@ 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[ATA_ID_PROD_LEN];
-        int len, i;
+        char model_num[ATA_ID_PROD_LEN + 1];
+        int i;
 
         /* Disk, UDMA */
         if (adev->class != ATA_DEV_ATA)
                 return ata_pci_default_filter(ap, adev, mask);
 
         /* Actually do need to check */
-        ata_id_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num));
-        /* Precuationary - why not do this in the libata core ?? */
+        ata_id_c_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num));
 
-        len = strlen(model_num);
-        while ((len > 0) && (model_num[len - 1] == ' ')) {
-                len--;
-                model_num[len] = 0;
-        }
-
-        for(i = 0; (p = csb_bad_ata100[i]) != NULL; i++) {
-                if (!strncmp(p, model_num, len))
+        for (i = 0; (p = csb_bad_ata100[i]) != NULL; i++) {
+                if (!strcmp(p, model_num))
                         mask &= ~(0x1F << ATA_SHIFT_UDMA);
         }
         return ata_pci_default_filter(ap, adev, mask);