ide: print banner message once per controller in m68k host drivers

* Print banner message once per controller in m68k host drivers.

* Change printk() level to KERN_INFO in buddha, falconide and gayle.

* Add banner message to q40ide.

This is basically a preparation for the future IDE layer changes.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/legacy/buddha.c b/drivers/ide/legacy/buddha.c
index e97766aef37417b4bb56b2d9f97b369d6b943b15..74d28e058f55a9038d609683f2bc0078ac6a2e2a 100644 (file)
--- a/drivers/ide/legacy/buddha.c
+++ b/drivers/ide/legacy/buddha.c
@@ -112,6 +112,7 @@ typedef enum BuddhaType_Enum {
     BOARD_BUDDHA, BOARD_CATWEASEL, BOARD_XSURF
 } BuddhaType;
 
+static const char *buddha_board_name[] = { "Buddha", "Catweasel", "X-Surf" };
 
     /*
      *  Check and acknowledge the interrupt status
@@ -197,7 +198,10 @@ fail_base2:
                /* X-Surf doesn't have this.  IRQs are always on */
                if (type != BOARD_XSURF)
                        z_writeb(0, buddha_board+BUDDHA_IRQ_MR);
-               
+
+               printk(KERN_INFO "ide: %s IDE controller\n",
+                                buddha_board_name[type]);
+
                for(i=0;i<buddha_num_hwifs;i++) {
                        if(type != BOARD_XSURF) {
                                ide_setup_ports(&hw, (buddha_board+buddha_bases[i]),
@@ -223,19 +227,6 @@ fail_base2:
                                ide_init_port_hw(hwif, &hw);
 
                                hwif->mmio = 1;
-                               printk("ide%d: ", index);
-                               switch(type) {
-                               case BOARD_BUDDHA:
-                                       printk("Buddha");
-                                       break;
-                               case BOARD_CATWEASEL:
-                                       printk("Catweasel");
-                                       break;
-                               case BOARD_XSURF:
-                                       printk("X-Surf");
-                                       break;
-                               }
-                               printk(" IDE interface\n");
 
                                idx[i] = index;
                        }

diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index dec2ef99c778699352ec1cf28b9bf39d3388f491..2860956bdcb079196c199e91af40163615670043 100644 (file)
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -67,6 +67,8 @@ static int __init falconide_init(void)
     if (MACH_IS_ATARI && ATARIHW_PRESENT(IDE)) {
        hw_regs_t hw;
 
+       printk(KERN_INFO "ide: Falcon IDE controller\n");
+
        ide_setup_ports(&hw, ATA_HD_BASE, falconide_offsets,
                        0, 0, NULL,
 //                     falconide_iops,
@@ -80,8 +82,6 @@ static int __init falconide_init(void)
                ide_init_port_data(hwif, index);
                ide_init_port_hw(hwif, &hw);
 
-               printk("ide%d: Falcon IDE interface\n", index);
-
                ide_device_add(idx);
        }
     }

diff --git a/drivers/ide/legacy/gayle.c b/drivers/ide/legacy/gayle.c
index e21ef75c905515f9036f67d408358d8b464a824b..492fa047efc00bb8da4b114f18f7e6b7b1405d88 100644 (file)
--- a/drivers/ide/legacy/gayle.c
+++ b/drivers/ide/legacy/gayle.c
@@ -129,6 +129,13 @@ static int __init gayle_init(void)
     return -ENODEV;
 
 found:
+       printk(KERN_INFO "ide: Gayle IDE controller (A%d style%s)\n",
+                        a4000 ? 4000 : 1200,
+#ifdef CONFIG_BLK_DEV_IDEDOUBLER
+                        ide_doubler ? ", IDE doubler" :
+#endif
+                        "");
+
     for (i = 0; i < GAYLE_NUM_PROBE_HWIFS; i++) {
        unsigned long base, ctrlport, irqport;
        ide_ack_intr_t *ack_intr;
@@ -173,17 +180,6 @@ found:
            ide_init_port_hw(hwif, &hw);
 
            hwif->mmio = 1;
-           switch (i) {
-               case 0:
-                   printk("ide%d: Gayle IDE interface (A%d style)\n", index,
-                          a4000 ? 4000 : 1200);
-                   break;
-#ifdef CONFIG_BLK_DEV_IDEDOUBLER
-               case 1:
-                   printk("ide%d: IDE doubler\n", index);
-                   break;
-#endif /* CONFIG_BLK_DEV_IDEDOUBLER */
-           }
 
            idx[i] = index;
        } else

diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
index 6b3e960350aaac663ecc139060c660310b5b9e49..782d4c76c0e578f607fdf20635838d8191db7b1d 100644 (file)
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
@@ -77,6 +77,9 @@ int macide_ack_intr(ide_hwif_t* hwif)
        return 0;
 }
 
+static const char *mac_ide_name[] =
+       { "Quadra", "Powerbook", "Powerbook Baboon" };
+
 /*
  * Probe for a Macintosh IDE interface
  */
@@ -109,6 +112,9 @@ static int __init macide_init(void)
                return -ENODEV;
        }
 
+       printk(KERN_INFO "ide: Macintosh %s IDE controller\n",
+                        mac_ide_name[macintosh_config->ide_type - 1]);
+
        hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
        if (hwif) {
                u8 index = hwif->index;
@@ -128,14 +134,6 @@ static int __init macide_init(void)
                }
 
                hwif->mmio = 1;
-               if (macintosh_config->ide_type == MAC_IDE_QUADRA)
-                       printk(KERN_INFO "ide%d: Macintosh Quadra IDE interface\n", index);
-               else if (macintosh_config->ide_type == MAC_IDE_PB)
-                       printk(KERN_INFO "ide%d: Macintosh Powerbook IDE interface\n", index);
-               else if (macintosh_config->ide_type == MAC_IDE_BABOON)
-                       printk(KERN_INFO "ide%d: Macintosh Powerbook Baboon IDE interface\n", index);
-               else
-                       printk(KERN_INFO "ide%d: Unknown Macintosh IDE interface\n", index);
 
                ide_device_add(idx);
        }

diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index 0154c91ee4b1c405dc9750d2d78c4a9df02efc71..f5329730df99d17bbd3abe5b2f05485c8e4d3db6 100644 (file)
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -121,6 +121,8 @@ static int __init q40ide_init(void)
     if (!MACH_IS_Q40)
       return -ENODEV;
 
+    printk(KERN_INFO "ide: Q40 IDE controller\n");
+
     for (i = 0; i < Q40IDE_NUM_HWIFS; i++) {
        hw_regs_t hw;