libata-sff: clean up inheritance in several drivers

[safe/jmp/linux-2.6] / drivers / ata / pata_icside.c

diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c
index fa812e2..832c8cc 100644 (file)
--- a/drivers/ata/pata_icside.c
+++ b/drivers/ata/pata_icside.c
@@ -321,7 +321,7 @@ static void pata_icside_postreset(struct ata_link *link, unsigned int *classes)
 }
 
 static struct ata_port_operations pata_icside_port_ops = {
-       .inherits               = &ata_sff_port_ops,
+       .inherits               = &ata_bmdma_port_ops,
        /* no need to build any PRD tables for DMA */
        .qc_prep                = ata_noop_qc_prep,
        .sff_data_xfer          = ata_sff_data_xfer_noirq,
@@ -334,6 +334,8 @@ static struct ata_port_operations pata_icside_port_ops = {
        .set_dmamode            = pata_icside_set_dmamode,
        .postreset              = pata_icside_postreset,
        .post_internal_cmd      = pata_icside_bmdma_stop,
+
+       .mode_filter            = ATA_OP_NULL,  /* will be removed soon */
 };
 
 static void __devinit