Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...

[linux-2.6] / drivers / ide / legacy / ali14xx.c

diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c
index 38c3a6d63f301c0e7df0a73a96b6f49353847712..33bb7b87be5dc539005de3c22c1e0dc7b93e7fa6 100644 (file)
--- a/drivers/ide/legacy/ali14xx.c
+++ b/drivers/ide/legacy/ali14xx.c
@@ -1,6 +1,4 @@
 /*
- *  linux/drivers/ide/legacy/ali14xx.c         Version 0.03    Feb 09, 1996
- *
  *  Copyright (C) 1996  Linus Torvalds & author (see below)
  */
 
@@ -88,7 +86,7 @@ static u8 regOff;     /* output to base port to close registers */
 /*
  * Read a controller register.
  */
-static inline u8 inReg (u8 reg)
+static inline u8 inReg(u8 reg)
 {
        outb_p(reg, regPort);
        return inb(dataPort);
@@ -97,7 +95,7 @@ static inline u8 inReg (u8 reg)
 /*
  * Write a controller register.
  */
-static void outReg (u8 data, u8 reg)
+static void outReg(u8 data, u8 reg)
 {
        outb_p(reg, regPort);
        outb_p(data, dataPort);
@@ -145,7 +143,7 @@ static void ali14xx_set_pio_mode(ide_drive_t *drive, const u8 pio)
 /*
  * Auto-detect the IDE controller port.
  */
-static int __init findPort (void)
+static int __init findPort(void)
 {
        int i;
        u8 t;
@@ -177,7 +175,8 @@ static int __init findPort (void)
 /*
  * Initialize controller registers with default values.
  */
-static int __init initRegisters (void) {
+static int __init initRegisters(void)
+{
        const RegInitializer *p;
        u8 t;
        unsigned long flags;
@@ -193,10 +192,17 @@ static int __init initRegisters (void) {
        return t;
 }
 
+static const struct ide_port_info ali14xx_port_info = {
+       .chipset                = ide_ali14xx,
+       .host_flags             = IDE_HFLAG_NO_DMA | IDE_HFLAG_NO_AUTOTUNE,
+       .pio_mask               = ATA_PIO4,
+};
+
 static int __init ali14xx_probe(void)
 {
        ide_hwif_t *hwif, *mate;
-       static u8 idx[4] = { 0, 1, 0xff, 0xff };
+       static u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
+       hw_regs_t hw[2];
 
        printk(KERN_DEBUG "ali14xx: base=0x%03x, regOn=0x%02x.\n",
                          basePort, regOn);
@@ -207,32 +213,39 @@ static int __init ali14xx_probe(void)
                return 1;
        }
 
-       hwif = &ide_hwifs[0];
-       mate = &ide_hwifs[1];
+       memset(&hw, 0, sizeof(hw));
 
-       hwif->chipset = ide_ali14xx;
-       hwif->pio_mask = ATA_PIO4;
-       hwif->set_pio_mode = &ali14xx_set_pio_mode;
-       hwif->mate = mate;
+       ide_std_init_ports(&hw[0], 0x1f0, 0x3f6);
+       hw[0].irq = 14;
 
-       mate->chipset = ide_ali14xx;
-       mate->pio_mask = ATA_PIO4;
-       mate->set_pio_mode = &ali14xx_set_pio_mode;
-       mate->mate = hwif;
-       mate->channel = 1;
+       ide_std_init_ports(&hw[1], 0x170, 0x376);
+       hw[1].irq = 15;
+
+       hwif = ide_find_port();
+       if (hwif) {
+               ide_init_port_hw(hwif, &hw[0]);
+               hwif->set_pio_mode = &ali14xx_set_pio_mode;
+               idx[0] = hwif->index;
+       }
+
+       mate = ide_find_port();
+       if (mate) {
+               ide_init_port_hw(mate, &hw[1]);
+               mate->set_pio_mode = &ali14xx_set_pio_mode;
+               idx[1] = mate->index;
+       }
 
-       ide_device_add(idx);
+       ide_device_add(idx, &ali14xx_port_info);
 
        return 0;
 }
 
-int probe_ali14xx = 0;
+int probe_ali14xx;
 
 module_param_named(probe, probe_ali14xx, bool, 0);
 MODULE_PARM_DESC(probe, "probe for ALI M14xx chipsets");
 
-/* Can be called directly from ide.c. */
-int __init ali14xx_init(void)
+static int __init ali14xx_init(void)
 {
        if (probe_ali14xx == 0)
                goto out;
@@ -248,9 +261,7 @@ out:
        return -ENODEV;
 }
 
-#ifdef MODULE
 module_init(ali14xx_init);
-#endif
 
 MODULE_AUTHOR("see local file");
 MODULE_DESCRIPTION("support of ALI 14XX IDE chipsets");