ide: prefix messages from IDE PCI host drivers by driver name

Prefix messages from IDE PCI host drivers by driver name instead of marketed
chipset name (it is still possible to exactly identify the particular chipset
basing on driver messages).

As a bonus this provides nice code savings for some drivers:

   text    data     bss     dec     hex filename
   3826     112       8    3946     f6a drivers/ide/pci/amd74xx.o.before
   2786     112       8    2906     b5a drivers/ide/pci/amd74xx.o.after
    764     108       0     872     368 drivers/ide/pci/cs5520.o.before
    680     108       0     788     314 drivers/ide/pci/cs5520.o.after
   1680     112       4    1796     704 drivers/ide/pci/generic.o.before
   1155     112       4    1271     4f7 drivers/ide/pci/generic.o.after
   7128     792       0    7920    1ef0 drivers/ide/pci/hpt366.o.before
   6984     792       0    7776    1e60 drivers/ide/pci/hpt366.o.after
   2800     148       0    2948     b84 drivers/ide/pci/pdc202xx_new.o.before
   2523     148       0    2671     a6f drivers/ide/pci/pdc202xx_new.o.after
   2831     148       0    2979     ba3 drivers/ide/pci/pdc202xx_old.o.before
   2683     148       0    2831     b0f drivers/ide/pci/pdc202xx_old.o.after
   3776     112       4    3892     f34 drivers/ide/pci/piix.o.before
   2804     112       4    2920     b68 drivers/ide/pci/piix.o.after
   4693     116       0    4809    12c9 drivers/ide/pci/siimage.o.before
   4600     116       0    4716    126c drivers/ide/pci/siimage.o.after

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 47 insertions, 59 deletions

diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index c16b1ab4d4ff..9eb411f5c358 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -54,6 +54,8 @@
 
 #include <asm/io.h>
 
+#define DRV_NAME "piix"
+
 static int no_piix_dma;
 
 /**
@@ -314,9 +316,9 @@ static const struct ide_port_ops piix_port_ops = {
  #define IDE_HFLAGS_PIIX 0
 #endif
 
-#define DECLARE_PIIX_DEV(name_str, udma) \
+#define DECLARE_PIIX_DEV(udma) \
         {                                               \
-                .name           = name_str,             \
+                .name           = DRV_NAME,             \
                 .init_hwif      = init_hwif_piix,       \
                 .enablebits     = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, \
                 .port_ops       = &piix_port_ops,       \
@@ -327,9 +329,9 @@ static const struct ide_port_ops piix_port_ops = {
                 .udma_mask      = udma,                 \
         }
 
-#define DECLARE_ICH_DEV(name_str, udma) \
+#define DECLARE_ICH_DEV(udma) \
         { \
-                .name           = name_str, \
+                .name           = DRV_NAME, \
                 .init_chipset   = init_chipset_ich, \
                 .init_hwif      = init_hwif_ich, \
                 .enablebits     = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, \
@@ -342,45 +344,31 @@ static const struct ide_port_ops piix_port_ops = {
         }
 
 static const struct ide_port_info piix_pci_info[] __devinitdata = {
-        /*  0 */ DECLARE_PIIX_DEV("PIIXa",      0x00),  /* no udma */
-        /*  1 */ DECLARE_PIIX_DEV("PIIXb",      0x00),  /* no udma */
-
-        /*  2 */
+        /* 0: MPIIX */
         {       /*
                  * MPIIX actually has only a single IDE channel mapped to
                  * the primary or secondary ports depending on the value
                  * of the bit 14 of the IDETIM register at offset 0x6c
                  */
-                .name           = "MPIIX",
+                .name           = DRV_NAME,
                 .enablebits     = {{0x6d,0xc0,0x80}, {0x6d,0xc0,0xc0}},
                 .host_flags     = IDE_HFLAG_ISA_PORTS | IDE_HFLAG_NO_DMA |
                                   IDE_HFLAGS_PIIX,
                 .pio_mask       = ATA_PIO4,
                 /* This is a painful system best to let it self tune for now */
         },
-
-        /*  3 */ DECLARE_PIIX_DEV("PIIX3",      0x00),  /* no udma */
-        /*  4 */ DECLARE_PIIX_DEV("PIIX4",      ATA_UDMA2),
-        /*  5 */ DECLARE_ICH_DEV("ICH0",        ATA_UDMA2),
-        /*  6 */ DECLARE_PIIX_DEV("PIIX4",      ATA_UDMA2),
-        /*  7 */ DECLARE_ICH_DEV("ICH",         ATA_UDMA4),
-        /*  8 */ DECLARE_PIIX_DEV("PIIX4",      ATA_UDMA4),
-        /*  9 */ DECLARE_PIIX_DEV("PIIX4",      ATA_UDMA2),
-        /* 10 */ DECLARE_ICH_DEV("ICH2",        ATA_UDMA5),
-        /* 11 */ DECLARE_ICH_DEV("ICH2M",       ATA_UDMA5),
-        /* 12 */ DECLARE_ICH_DEV("ICH3M",       ATA_UDMA5),
-        /* 13 */ DECLARE_ICH_DEV("ICH3",        ATA_UDMA5),
-        /* 14 */ DECLARE_ICH_DEV("ICH4",        ATA_UDMA5),
-        /* 15 */ DECLARE_ICH_DEV("ICH5",        ATA_UDMA5),
-        /* 16 */ DECLARE_ICH_DEV("C-ICH",       ATA_UDMA5),
-        /* 17 */ DECLARE_ICH_DEV("ICH4",        ATA_UDMA5),
-        /* 18 */ DECLARE_ICH_DEV("ICH5-SATA",   ATA_UDMA5),
-        /* 19 */ DECLARE_ICH_DEV("ICH5",        ATA_UDMA5),
-        /* 20 */ DECLARE_ICH_DEV("ICH6",        ATA_UDMA5),
-        /* 21 */ DECLARE_ICH_DEV("ICH7",        ATA_UDMA5),
-        /* 22 */ DECLARE_ICH_DEV("ICH4",        ATA_UDMA5),
-        /* 23 */ DECLARE_ICH_DEV("ESB2",        ATA_UDMA5),
-        /* 24 */ DECLARE_ICH_DEV("ICH8M",       ATA_UDMA5),
+        /* 1: PIIXa/PIIXb/PIIX3 */
+        DECLARE_PIIX_DEV(0x00), /* no udma */
+        /* 2: PIIX4 */
+        DECLARE_PIIX_DEV(ATA_UDMA2),
+        /* 3: ICH0 */
+        DECLARE_ICH_DEV(ATA_UDMA2),
+        /* 4: ICH */
+        DECLARE_ICH_DEV(ATA_UDMA4),
+        /* 5: PIIX4 */
+        DECLARE_PIIX_DEV(ATA_UDMA4),
+        /* 6: ICH[2-7]/ICH[2-3]M/C-ICH/ICH5-SATA/ESB2/ICH8M */
+        DECLARE_ICH_DEV(ATA_UDMA5),
 };
 
 /**
@@ -421,39 +409,39 @@ static void __devinit piix_check_450nx(void)
                         no_piix_dma = 2;
         }
         if(no_piix_dma)
-                printk(KERN_WARNING "piix: 450NX errata present, disabling IDE DMA.\n");
+                printk(KERN_WARNING DRV_NAME ": 450NX errata present, disabling IDE DMA.\n");
         if(no_piix_dma == 2)
-                printk(KERN_WARNING "piix: A BIOS update may resolve this.\n");
+                printk(KERN_WARNING DRV_NAME ": A BIOS update may resolve this.\n");
 }               
 
 static const struct pci_device_id piix_pci_tbl[] = {
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82371FB_0),   0 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82371FB_1),   1 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82371MX),     2 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82371SB_1),   3 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82371AB),     4 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801AB_1),   5 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82443MX_1),   6 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801AA_1),   7 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82372FB_1),   8 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82451NX),     9 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801BA_9),  10 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801BA_8),  11 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801CA_10), 12 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801CA_11), 13 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801DB_11), 14 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801EB_11), 15 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801E_11),  16 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801DB_10), 17 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82371FB_0),  1 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82371FB_1),  1 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82371MX),    0 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82371SB_1),  1 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82371AB),    2 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801AB_1),  3 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82443MX_1),  2 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801AA_1),  4 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82372FB_1),  5 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82451NX),    2 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801BA_9),  6 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801BA_8),  6 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801CA_10), 6 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801CA_11), 6 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801DB_11), 6 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801EB_11), 6 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801E_11),  6 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801DB_10), 6 },
 #ifdef CONFIG_BLK_DEV_IDE_SATA
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801EB_1),  18 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801EB_1),  6 },
 #endif
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ESB_2),      19 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICH6_19),    20 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICH7_21),    21 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801DB_1),  22 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ESB2_18),    23 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICH8_6),     24 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ESB_2),      6 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICH6_19),    6 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICH7_21),    6 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801DB_1),  6 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ESB2_18),    6 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICH8_6),     6 },
         { 0, },
 };
 MODULE_DEVICE_TABLE(pci, piix_pci_tbl);