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, 10 insertions, 12 deletions

diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c
index 57bc15cddca0..a89cd80d8124 100644
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/legacy/ht6560b.c
@@ -305,6 +305,15 @@ int probe_ht6560b = 0;
 module_param_named(probe, probe_ht6560b, bool, 0);
 MODULE_PARM_DESC(probe, "probe for HT6560B chipset");
 
+static const struct ide_port_info ht6560b_port_info __initdata = {
+        .chipset                = ide_ht6560b,
+        .host_flags             = IDE_HFLAG_SERIALIZE | /* is this needed? */
+                                  IDE_HFLAG_NO_DMA |
+                                  IDE_HFLAG_NO_AUTOTUNE |
+                                  IDE_HFLAG_ABUSE_PREFETCH,
+        .pio_mask               = ATA_PIO5,
+};
+
 static int __init ht6560b_init(void)
 {
         ide_hwif_t *hwif, *mate;
@@ -328,22 +337,11 @@ static int __init ht6560b_init(void)
                 goto release_region;
         }
 
-        hwif->chipset = ide_ht6560b;
         hwif->selectproc = &ht6560b_selectproc;
-        hwif->host_flags = IDE_HFLAG_ABUSE_PREFETCH;
-        hwif->pio_mask = ATA_PIO5;
         hwif->set_pio_mode = &ht6560b_set_pio_mode;
-        hwif->serialized = 1;   /* is this needed? */
-        hwif->mate = mate;
 
-        mate->chipset = ide_ht6560b;
         mate->selectproc = &ht6560b_selectproc;
-        mate->host_flags = IDE_HFLAG_ABUSE_PREFETCH;
-        mate->pio_mask = ATA_PIO5;
         mate->set_pio_mode = &ht6560b_set_pio_mode;
-        mate->serialized = 1;   /* is this needed? */
-        mate->mate = hwif;
-        mate->channel = 1;
 
         /*
          * Setting default configurations for drives
@@ -357,7 +355,7 @@ static int __init ht6560b_init(void)
         mate->drives[0].drive_data = t;
         mate->drives[1].drive_data = t;
 
-        ide_device_add(idx);
+        ide_device_add(idx, &ht6560b_port_info);
 
         return 0;