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>

3 files changed, 15 insertions, 14 deletions

diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index 8d2cc47a362e..fb00f3827ecd 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -377,9 +377,6 @@ static void icside_dma_lost_irq(ide_drive_t *drive)
 
 static void icside_dma_init(ide_hwif_t *hwif)
 {
-        hwif->mwdma_mask        = 7; /* MW0..2 */
-        hwif->swdma_mask        = 7; /* SW0..2 */
-
         hwif->dmatable_cpu      = NULL;
         hwif->dmatable_dma      = 0;
         hwif->set_dma_mode      = icside_set_dma_mode;
@@ -459,11 +456,19 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 
         idx[0] = hwif->index;
 
-        ide_device_add(idx);
+        ide_device_add(idx, NULL);
 
         return 0;
 }
 
+static const struct ide_port_info icside_v6_port_info __initdata = {
+        .host_flags             = IDE_HFLAG_SERIALIZE |
+                                  IDE_HFLAG_NO_DMA | /* no SFF-style DMA */
+                                  IDE_HFLAG_NO_AUTOTUNE,
+        .mwdma_mask             = ATA_MWDMA2,
+        .swdma_mask             = ATA_SWDMA2,
+};
+
 static int __init
 icside_register_v6(struct icside_state *state, struct expansion_card *ec)
 {
@@ -472,6 +477,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
         unsigned int sel = 0;
         int ret;
         u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
+        struct ide_port_info d = icside_v6_port_info;
 
         ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
         if (!ioc_base) {
@@ -521,30 +527,25 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
         state->hwif[1]    = mate;
 
         hwif->maskproc    = icside_maskproc;
-        hwif->channel     = 0;
         hwif->hwif_data   = state;
-        hwif->mate        = mate;
-        hwif->serialized  = 1;
         hwif->config_data = (unsigned long)ioc_base;
         hwif->select_data = sel;
 
         mate->maskproc    = icside_maskproc;
-        mate->channel     = 1;
         mate->hwif_data   = state;
-        mate->mate        = hwif;
-        mate->serialized  = 1;
         mate->config_data = (unsigned long)ioc_base;
         mate->select_data = sel | 1;
 
         if (ec->dma != NO_DMA && !request_dma(ec->dma, hwif->name)) {
                 icside_dma_init(hwif);
                 icside_dma_init(mate);
-        }
+        } else
+                d.mwdma_mask = d.swdma_mask = 0;
 
         idx[0] = hwif->index;
         idx[1] = mate->index;
 
-        ide_device_add(idx);
+        ide_device_add(idx, &d);
 
         return 0;
 
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index 60f2497542c0..43a70e91363e 100644
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -39,7 +39,7 @@ static int __init ide_arm_init(void)
                 ide_init_port_hw(hwif, &hw);
                 idx[0] = hwif->index;
 
-                ide_device_add(idx);
+                ide_device_add(idx, NULL);
         }
 
         return 0;
diff --git a/drivers/ide/arm/rapide.c b/drivers/ide/arm/rapide.c
index c8b6581e624e..b30adcf321c3 100644
--- a/drivers/ide/arm/rapide.c
+++ b/drivers/ide/arm/rapide.c
@@ -58,7 +58,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
 
                 idx[0] = hwif->index;
 
-                ide_device_add(idx);
+                ide_device_add(idx, NULL);
 
                 ecard_set_drvdata(ec, hwif);
                 goto out;