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

diff --git a/include/linux/ide.h b/include/linux/ide.h
index e5f41741ba91..079b6f9405ed 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -413,6 +413,17 @@ struct ide_port_ops {
         u8      (*cable_detect)(struct hwif_s *);
 };
 
+struct ide_dma_ops {
+        void    (*dma_host_set)(struct ide_drive_s *, int);
+        int     (*dma_setup)(struct ide_drive_s *);
+        void    (*dma_exec_cmd)(struct ide_drive_s *, u8);
+        void    (*dma_start)(struct ide_drive_s *);
+        int     (*dma_end)(struct ide_drive_s *);
+        int     (*dma_test_irq)(struct ide_drive_s *);
+        void    (*dma_lost_irq)(struct ide_drive_s *);
+        void    (*dma_timeout)(struct ide_drive_s *);
+};
+
 typedef struct hwif_s {
         struct hwif_s *next;            /* for linked-list in ide_hwgroup_t */
         struct hwif_s *mate;            /* other hwif from same PCI chip */
@@ -451,6 +462,7 @@ typedef struct hwif_s {
         void (*rw_disk)(ide_drive_t *, struct request *);
 
         const struct ide_port_ops       *port_ops;
+        struct ide_dma_ops              *dma_ops;
 
         void (*ata_input_data)(ide_drive_t *, void *, u32);
         void (*ata_output_data)(ide_drive_t *, void *, u32);
@@ -458,15 +470,7 @@ typedef struct hwif_s {
         void (*atapi_input_bytes)(ide_drive_t *, void *, u32);
         void (*atapi_output_bytes)(ide_drive_t *, void *, u32);
 
-        void (*dma_host_set)(ide_drive_t *, int);
-        int (*dma_setup)(ide_drive_t *);
-        void (*dma_exec_cmd)(ide_drive_t *, u8);
-        void (*dma_start)(ide_drive_t *);
-        int (*ide_dma_end)(ide_drive_t *drive);
-        int (*ide_dma_test_irq)(ide_drive_t *drive);
         void (*ide_dma_clear_irq)(ide_drive_t *drive);
-        void (*dma_lost_irq)(ide_drive_t *drive);
-        void (*dma_timeout)(ide_drive_t *drive);
 
         void (*OUTB)(u8 addr, unsigned long port);
         void (*OUTBSYNC)(ide_drive_t *drive, u8 addr, unsigned long port);
@@ -1114,6 +1118,7 @@ struct ide_port_info {
                                             const struct ide_port_info *);
 
         const struct ide_port_ops       *port_ops;
+        struct ide_dma_ops              *dma_ops;
 
         ide_pci_enablebit_t     enablebits[2];
         hwif_chipset_t          chipset;
@@ -1165,7 +1170,7 @@ void ide_destroy_dmatable(ide_drive_t *);
 extern int ide_build_dmatable(ide_drive_t *, struct request *);
 int ide_allocate_dma_engine(ide_hwif_t *);
 void ide_release_dma_engine(ide_hwif_t *);
-extern void ide_setup_dma(ide_hwif_t *, unsigned long);
+void ide_setup_dma(ide_hwif_t *, unsigned long, const struct ide_port_info *);
 
 void ide_dma_host_set(ide_drive_t *, int);
 extern int ide_dma_setup(ide_drive_t *);