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, 14 deletions

diff --git a/drivers/ide/legacy/dtc2278.c b/drivers/ide/legacy/dtc2278.c
index 092c04abbe7a..7cbf2f1f35f9 100644
--- a/drivers/ide/legacy/dtc2278.c
+++ b/drivers/ide/legacy/dtc2278.c
@@ -86,6 +86,15 @@ static void dtc2278_set_pio_mode(ide_drive_t *drive, const u8 pio)
         }
 }
 
+static const struct ide_port_info dtc2278_port_info __initdata = {
+        .chipset                = ide_dtc2278,
+        .host_flags             = IDE_HFLAG_SERIALIZE |
+                                  IDE_HFLAG_IO_32BIT |
+                                  IDE_HFLAG_NO_DMA |
+                                  IDE_HFLAG_NO_AUTOTUNE,
+        .pio_mask               = ATA_PIO4,
+};
+
 static int __init dtc2278_probe(void)
 {
         unsigned long flags;
@@ -116,29 +125,16 @@ static int __init dtc2278_probe(void)
 #endif
         local_irq_restore(flags);
 
-        hwif->serialized = 1;
         hwif->no_io_32bit = 1;  /* disallow ->io_32bit changes */
-        hwif->chipset = ide_dtc2278;
-        hwif->pio_mask = ATA_PIO4;
         hwif->set_pio_mode = &dtc2278_set_pio_mode;
         hwif->drives[0].no_unmask = 1;
         hwif->drives[1].no_unmask = 1;
-        hwif->drives[0].io_32bit = 1;
-        hwif->drives[1].io_32bit = 1;
-        hwif->mate = mate;
 
-        mate->serialized = 1;
         mate->no_io_32bit = 1;
-        mate->chipset = ide_dtc2278;
-        mate->pio_mask = ATA_PIO4;
         mate->drives[0].no_unmask = 1;
         mate->drives[1].no_unmask = 1;
-        mate->drives[0].io_32bit = 1;
-        mate->drives[1].io_32bit = 1;
-        mate->mate = hwif;
-        mate->channel = 1;
 
-        ide_device_add(idx);
+        ide_device_add(idx, &dtc2278_port_info);
 
         return 0;
 }