ide: add struct ide_dma_ops (take 3)

Add struct ide_dma_ops and convert core code + drivers to use it.

While at it:

* Drop "ide_" prefix from ->ide_dma_end and ->ide_dma_test_irq methods.

* Drop "ide_" "infixes" from DMA methods.

* au1xxx-ide.c:
  - use auide_dma_{test_irq,end}() directly in auide_dma_timeout()

* pdc202xx_old.c:
  - drop "old_" "infixes" from DMA methods

* siimage.c:
  - add siimage_dma_test_irq() helper
  - print SATA warning in siimage_init_one()

* Remove no longer needed ->init_hwif implementations.

v2:
* Changes based on review from Sergei:
  - s/siimage_ide_dma_test_irq/siimage_dma_test_irq/
  - s/drive->hwif/hwif/ in idefloppy_pc_intr().
  - fix patch description w.r.t. au1xxx-ide changes
  - fix au1xxx-ide build
  - fix naming for cmd64*_dma_ops
  - drop "ide_" and "old_" infixes
  - s/hpt3xxx_dma_ops/hpt37x_dma_ops/
  - s/hpt370x_dma_ops/hpt370_dma_ops/
  - use correct DMA ops for HPT302/N, HPT371/N and HPT374
  - s/it821x_smart_dma_ops/it821x_pass_through_dma_ops/

v3:
* Two bugs slipped in v2 (noticed by Sergei):
  - use correct DMA ops for HPT374 (for real this time)
  - handle HPT370/HPT370A properly

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

1 files changed, 35 insertions, 41 deletions

diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index faf5c3d6ab72..1fffea3211bd 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -301,7 +301,7 @@ static void sil_set_dma_mode(ide_drive_t *drive, const u8 speed)
 }
 
 /* returns 1 if dma irq issued, 0 otherwise */
-static int siimage_io_ide_dma_test_irq (ide_drive_t *drive)
+static int siimage_io_dma_test_irq(ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = to_pci_dev(hwif->dev);
@@ -320,14 +320,14 @@ static int siimage_io_ide_dma_test_irq (ide_drive_t *drive)
 }
 
 /**
- *      siimage_mmio_ide_dma_test_irq   -       check we caused an IRQ
+ *      siimage_mmio_dma_test_irq       -       check we caused an IRQ
  *      @drive: drive we are testing
  *
  *      Check if we caused an IDE DMA interrupt. We may also have caused
  *      SATA status interrupts, if so we clean them up and continue.
  */
- 
-static int siimage_mmio_ide_dma_test_irq (ide_drive_t *drive)
+
+static int siimage_mmio_dma_test_irq(ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         unsigned long addr      = siimage_selreg(hwif, 0x1);
@@ -369,6 +369,14 @@ static int siimage_mmio_ide_dma_test_irq (ide_drive_t *drive)
         return 0;
 }
 
+static int siimage_dma_test_irq(ide_drive_t *drive)
+{
+        if (drive->hwif->mmio)
+                return siimage_mmio_dma_test_irq(drive);
+        else
+                return siimage_io_dma_test_irq(drive);
+}
+
 /**
  *      sil_sata_reset_poll     -       wait for SATA reset
  *      @drive: drive we are resetting
@@ -756,41 +764,6 @@ static u8 __devinit sil_cable_detect(ide_hwif_t *hwif)
         return (ata66 & 0x01) ? ATA_CBL_PATA80 : ATA_CBL_PATA40;
 }
 
-/**
- *      init_hwif_siimage       -       set up hwif structs
- *      @hwif: interface to set up
- *
- *      We do the basic set up of the interface structure. The SIIMAGE
- *      requires several custom handlers so we override the default
- *      ide DMA handlers appropriately
- */
-
-static void __devinit init_hwif_siimage(ide_hwif_t *hwif)
-{
-        u8 sata = is_sata(hwif);
-
-        if (sata) {
-                static int first = 1;
-
-                if (first) {
-                        printk(KERN_INFO "siimage: For full SATA support you should use the libata sata_sil module.\n");
-                        first = 0;
-                }
-        }
-
-        if (hwif->dma_base == 0)
-                return;
-
-        if (sata)
-                hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
-
-        if (hwif->mmio) {
-                hwif->ide_dma_test_irq = &siimage_mmio_ide_dma_test_irq;
-        } else {
-                hwif->ide_dma_test_irq = & siimage_io_ide_dma_test_irq;
-        }
-}
-
 static const struct ide_port_ops sil_pata_port_ops = {
         .set_pio_mode           = sil_set_pio_mode,
         .set_dma_mode           = sil_set_dma_mode,
@@ -809,13 +782,17 @@ static const struct ide_port_ops sil_sata_port_ops = {
         .cable_detect           = sil_cable_detect,
 };
 
+static struct ide_dma_ops sil_dma_ops = {
+        .dma_test_irq           = siimage_dma_test_irq,
+};
+
 #define DECLARE_SII_DEV(name_str, p_ops)                \
         {                                               \
                 .name           = name_str,             \
                 .init_chipset   = init_chipset_siimage, \
                 .init_iops      = init_iops_siimage,    \
-                .init_hwif      = init_hwif_siimage,    \
                 .port_ops       = p_ops,                \
+                .dma_ops        = &sil_dma_ops,         \
                 .pio_mask       = ATA_PIO4,             \
                 .mwdma_mask     = ATA_MWDMA2,           \
                 .udma_mask      = ATA_UDMA6,            \
@@ -838,7 +815,24 @@ static const struct ide_port_info siimage_chipsets[] __devinitdata = {
  
 static int __devinit siimage_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        return ide_setup_pci_device(dev, &siimage_chipsets[id->driver_data]);
+        struct ide_port_info d;
+        u8 idx = id->driver_data;
+
+        d = siimage_chipsets[idx];
+
+        if (idx) {
+                static int first = 1;
+
+                if (first) {
+                        printk(KERN_INFO "siimage: For full SATA support you "
+                                "should use the libata sata_sil module.\n");
+                        first = 0;
+                }
+
+                d.host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
+        }
+
+        return ide_setup_pci_device(dev, &d);
 }
 
 static const struct pci_device_id siimage_pci_tbl[] = {