libata-sff: clean up inheritance in several drivers

1. pata_cmd640 is PIO only.  Inherit from sff.

2. pata_macio is BMDMA.  Inherit from bmdma and drop explicit
   bmdma_mode_filter() setting.

3. In sata_mv, unlike mv5, mv6 is BMDMA.  Inherit from bmdma and
   don't clear ->post_internal_cmd().

4. bf54x and icside are quasi-BMDMA controllers which don't use the
   standard BMDMA registers so they don't initialize bmdma_addr and
   inherit from sff to avoid the default mode_filter which disables
   DMA modes if bmdma_addr is not initialized.

For 2 and 3, this patch makes the drivers explicitly specify
->mode_filter to ATA_OP_NULL while inheriting from ata_bmdma_port_ops.
These will be removed by the next patch.

This patch makes all and only BMDMA drivers inherit from
ata_bmdma_port_ops to ease further SFF/BMDMA separation.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

1 files changed, 20 insertions, 4 deletions

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 318862e8a8a9..a03371075990 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -686,16 +686,27 @@ static struct ata_port_operations mv5_ops = {
 };
 
 static struct ata_port_operations mv6_ops = {
-        .inherits               = &mv5_ops,
+        .inherits               = &ata_bmdma_port_ops,
+
+        .lost_interrupt         = ATA_OP_NULL,
+
+        .qc_defer               = mv_qc_defer,
+        .qc_prep                = mv_qc_prep,
+        .qc_issue               = mv_qc_issue,
+
         .dev_config             = mv6_dev_config,
-        .scr_read               = mv_scr_read,
-        .scr_write              = mv_scr_write,
 
+        .freeze                 = mv_eh_freeze,
+        .thaw                   = mv_eh_thaw,
+        .hardreset              = mv_hardreset,
+        .softreset              = mv_softreset,
         .pmp_hardreset          = mv_pmp_hardreset,
         .pmp_softreset          = mv_softreset,
-        .softreset              = mv_softreset,
         .error_handler          = mv_pmp_error_handler,
 
+        .scr_read               = mv_scr_read,
+        .scr_write              = mv_scr_write,
+
         .sff_check_status       = mv_sff_check_status,
         .sff_irq_clear          = mv_sff_irq_clear,
         .check_atapi_dma        = mv_check_atapi_dma,
@@ -703,6 +714,11 @@ static struct ata_port_operations mv6_ops = {
         .bmdma_start            = mv_bmdma_start,
         .bmdma_stop             = mv_bmdma_stop,
         .bmdma_status           = mv_bmdma_status,
+
+        .port_start             = mv_port_start,
+        .port_stop              = mv_port_stop,
+
+        .mode_filter            = ATA_OP_NULL,  /* will be removed soon */
 };
 
 static struct ata_port_operations mv_iie_ops = {