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

diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c
index 0640a38ff127..ac645263fd09 100644
--- a/drivers/ide/cris/ide-cris.c
+++ b/drivers/ide/cris/ide-cris.c
@@ -753,6 +753,15 @@ static void cris_set_dma_mode(ide_drive_t *drive, const u8 speed)
                 cris_ide_set_speed(TYPE_DMA, 0, strobe, hold);
 }
 
+static const struct ide_port_info cris_port_info __initdata = {
+        .chipset                = ide_etrax100,
+        .host_flags             = IDE_HFLAG_NO_ATAPI_DMA |
+                                  IDE_HFLAG_NO_DMA, /* no SFF-style DMA */
+        .pio_mask               = ATA_PIO4,
+        .udma_mask              = cris_ultra_mask,
+        .mwdma_mask             = ATA_MWDMA2,
+};
+
 static int __init init_e100_ide(void)
 {
         hw_regs_t hw;
@@ -780,7 +789,6 @@ static int __init init_e100_ide(void)
                 ide_init_port_data(hwif, hwif->index);
                 ide_init_port_hw(hwif, &hw);
                 hwif->mmio = 1;
-                hwif->chipset = ide_etrax100;
                 hwif->set_pio_mode = &cris_set_pio_mode;
                 hwif->set_dma_mode = &cris_set_dma_mode;
                 hwif->ata_input_data = &cris_ide_input_data;
@@ -799,12 +807,6 @@ static int __init init_e100_ide(void)
                 hwif->INB = &cris_ide_inb;
                 hwif->INW = &cris_ide_inw;
                 hwif->cbl = ATA_CBL_PATA40;
-                hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
-                hwif->pio_mask = ATA_PIO4,
-                hwif->drives[0].autotune = 1;
-                hwif->drives[1].autotune = 1;
-                hwif->ultra_mask = cris_ultra_mask;
-                hwif->mwdma_mask = 0x07; /* Multiword DMA 0-2 */
 
                 idx[h] = hwif->index;
         }
@@ -820,7 +822,7 @@ static int __init init_e100_ide(void)
         cris_ide_set_speed(TYPE_DMA, 0, ATA_DMA2_STROBE, ATA_DMA2_HOLD);
         cris_ide_set_speed(TYPE_UDMA, ATA_UDMA2_CYC, ATA_UDMA2_DVS, 0);
 
-        ide_device_add(idx);
+        ide_device_add(idx, &cris_port_info);
 
         return 0;
 }