3 files changed, 5 insertions, 6 deletions

diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 4a3d1f214457..6a103b310cac 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -53,7 +53,6 @@ const struct ata_port_operations ata_sff_port_ops = {
         .softreset              = ata_sff_softreset,
         .hardreset              = sata_sff_hardreset,
         .postreset              = ata_sff_postreset,
-        .drain_fifo             = ata_sff_drain_fifo,
         .error_handler          = ata_sff_error_handler,
         .post_internal_cmd      = ata_sff_post_internal_cmd,
 
@@ -64,6 +63,7 @@ const struct ata_port_operations ata_sff_port_ops = {
         .sff_exec_command       = ata_sff_exec_command,
         .sff_data_xfer          = ata_sff_data_xfer,
         .sff_irq_clear          = ata_sff_irq_clear,
+        .sff_drain_fifo         = ata_sff_drain_fifo,
 
         .lost_interrupt         = ata_sff_lost_interrupt,
 };
@@ -2398,8 +2398,8 @@ void ata_sff_error_handler(struct ata_port *ap)
          * if we touch the data port post reset. Pass qc in case anyone wants
          *  to do different PIO/DMA recovery or has per command fixups
          */
-        if (ap->ops->drain_fifo)
-                ap->ops->drain_fifo(qc);
+        if (ap->ops->sff_drain_fifo)
+                ap->ops->sff_drain_fifo(qc);
 
         spin_unlock_irqrestore(ap->lock, flags);
 
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index d94b8f0bd743..ef374388c0f6 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -175,7 +175,7 @@ static struct ata_port_operations pcmcia_8bit_port_ops = {
         .sff_data_xfer  = ata_data_xfer_8bit,
         .cable_detect   = ata_cable_40wire,
         .set_mode       = pcmcia_set_mode_8bit,
-        .drain_fifo     = pcmcia_8bit_drain_fifo,
+        .sff_drain_fifo = pcmcia_8bit_drain_fifo,
 };
 
 
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 45a547e42d47..19f716edd3be 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -856,13 +856,12 @@ struct ata_port_operations {
         void (*sff_irq_on)(struct ata_port *);
         bool (*sff_irq_check)(struct ata_port *);
         void (*sff_irq_clear)(struct ata_port *);
+        void (*sff_drain_fifo)(struct ata_queued_cmd *qc);
 
         void (*bmdma_setup)(struct ata_queued_cmd *qc);
         void (*bmdma_start)(struct ata_queued_cmd *qc);
         void (*bmdma_stop)(struct ata_queued_cmd *qc);
         u8   (*bmdma_status)(struct ata_port *ap);
-
-        void (*drain_fifo)(struct ata_queued_cmd *qc);
 #endif /* CONFIG_ATA_SFF */
 
         ssize_t (*em_show)(struct ata_port *ap, char *buf);