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

diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index 7e354d33323b..c506e97cd716 100644
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -214,7 +214,7 @@ static void trm290_dma_start(ide_drive_t *drive)
 {
 }
 
-static int trm290_ide_dma_end (ide_drive_t *drive)
+static int trm290_dma_end(ide_drive_t *drive)
 {
         u16 status;
 
@@ -225,7 +225,7 @@ static int trm290_ide_dma_end (ide_drive_t *drive)
         return status != 0x00ff;
 }
 
-static int trm290_ide_dma_test_irq (ide_drive_t *drive)
+static int trm290_dma_test_irq(ide_drive_t *drive)
 {
         u16 status;
 
@@ -280,12 +280,6 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
                 /* sharing IRQ with mate */
                 hwif->irq = hwif->mate->irq;
 
-        hwif->dma_host_set      = &trm290_dma_host_set;
-        hwif->dma_setup         = &trm290_dma_setup;
-        hwif->dma_exec_cmd      = &trm290_dma_exec_cmd;
-        hwif->dma_start         = &trm290_dma_start;
-        hwif->ide_dma_end       = &trm290_ide_dma_end;
-        hwif->ide_dma_test_irq  = &trm290_ide_dma_test_irq;
 #if 1
         {
         /*
@@ -319,11 +313,21 @@ static const struct ide_port_ops trm290_port_ops = {
         .selectproc             = trm290_selectproc,
 };
 
+static struct ide_dma_ops trm290_dma_ops = {
+        .dma_host_set           = trm290_dma_host_set,
+        .dma_setup              = trm290_dma_setup,
+        .dma_exec_cmd           = trm290_dma_exec_cmd,
+        .dma_start              = trm290_dma_start,
+        .dma_end                = trm290_dma_end,
+        .dma_test_irq           = trm290_dma_test_irq,
+};
+
 static const struct ide_port_info trm290_chipset __devinitdata = {
         .name           = "TRM290",
         .init_hwif      = init_hwif_trm290,
         .chipset        = ide_trm290,
         .port_ops       = &trm290_port_ops,
+        .dma_ops        = &trm290_dma_ops,
         .host_flags     = IDE_HFLAG_NO_ATAPI_DMA |
 #if 0 /* play it safe for now */
                           IDE_HFLAG_TRUST_BIOS_FOR_DMA |