ide: add struct ide_port_info instances to legacy host drivers

* Remove 'struct pci_dev *dev' argument from ide_hwif_setup_dma().

* Un-static ide_hwif_setup_dma() and add CONFIG_BLK_DEV_IDEDMA_PCI=n version.

* Add 'const struct ide_port_info *d' argument to ide_device_add[_all]().

* Factor out generic ports init from ide_pci_setup_ports() to ide_init_port(),
  move it to ide-probe.c and call it in in ide_device_add_all() instead of
  ide_pci_setup_ports().

* Move ->mate setup to ide_device_add_all() from ide_port_init().

* Add IDE_HFLAG_NO_AUTOTUNE host flag for host drivers that don't enable
  ->autotune currently.

* Setup hwif->chipset in ide_init_port() but iff pi->chipset is set
  (to not override setup done by ide_hwif_configure()).

* Add ETRAX host handling to ide_device_add_all().

* cmd640.c: set IDE_HFLAG_ABUSE_* also for CONFIG_BLK_DEV_CMD640_ENHANCED=n.

* pmac.c: make pmac_ide_setup_dma() return an error value and move DMA masks
  setup to pmac_ide_setup_device().

* Add 'struct ide_port_info' instances to legacy host drivers, pass them to
  ide_device_add() calls and then remove open-coded ports initialization.

Reviewed-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 9 insertions, 15 deletions

diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c
index e3ea2096804a..d4d1a6bea599 100644
--- a/drivers/ide/legacy/ali14xx.c
+++ b/drivers/ide/legacy/ali14xx.c
@@ -191,9 +191,14 @@ 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 };
 
         printk(KERN_DEBUG "ali14xx: base=0x%03x, regOn=0x%02x.\n",
@@ -205,21 +210,10 @@ static int __init ali14xx_probe(void)
                 return 1;
         }
 
-        hwif = &ide_hwifs[0];
-        mate = &ide_hwifs[1];
-
-        hwif->chipset = ide_ali14xx;
-        hwif->pio_mask = ATA_PIO4;
-        hwif->set_pio_mode = &ali14xx_set_pio_mode;
-        hwif->mate = mate;
-
-        mate->chipset = ide_ali14xx;
-        mate->pio_mask = ATA_PIO4;
-        mate->set_pio_mode = &ali14xx_set_pio_mode;
-        mate->mate = hwif;
-        mate->channel = 1;
+        ide_hwifs[0].set_pio_mode = &ali14xx_set_pio_mode;
+        ide_hwifs[1].set_pio_mode = &ali14xx_set_pio_mode;
 
-        ide_device_add(idx);
+        ide_device_add(idx, &ali14xx_port_info);
 
         return 0;
 }