1 files changed, 4 insertions, 60 deletions

diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c
index ebfcda26d639..8e3cdef8a25f 100644
--- a/drivers/ata/pata_rb532_cf.c
+++ b/drivers/ata/pata_rb532_cf.c
@@ -48,63 +48,11 @@
 struct rb532_cf_info {
         void __iomem    *iobase;
         unsigned int    gpio_line;
-        int             frozen;
         unsigned int    irq;
 };
 
 /* ------------------------------------------------------------------------ */
 
-static inline void rb532_pata_finish_io(struct ata_port *ap)
-{
-        struct ata_host *ah = ap->host;
-        struct rb532_cf_info *info = ah->private_data;
-
-        /* FIXME: Keep previous delay. If this is merely a fence then
-           ata_sff_sync might be sufficient. */
-        ata_sff_dma_pause(ap);
-        ndelay(RB500_CF_IO_DELAY);
-}
-
-static void rb532_pata_exec_command(struct ata_port *ap,
-                                const struct ata_taskfile *tf)
-{
-        writeb(tf->command, ap->ioaddr.command_addr);
-        rb532_pata_finish_io(ap);
-}
-
-static unsigned int rb532_pata_data_xfer(struct ata_device *adev, unsigned char *buf,
-                                unsigned int buflen, int write_data)
-{
-        struct ata_port *ap = adev->link->ap;
-        void __iomem *ioaddr = ap->ioaddr.data_addr;
-        int retlen = buflen;
-
-        if (write_data) {
-                for (; buflen > 0; buflen--, buf++)
-                        writeb(*buf, ioaddr);
-        } else {
-                for (; buflen > 0; buflen--, buf++)
-                        *buf = readb(ioaddr);
-        }
-
-        rb532_pata_finish_io(adev->link->ap);
-        return retlen;
-}
-
-static void rb532_pata_freeze(struct ata_port *ap)
-{
-        struct rb532_cf_info *info = ap->host->private_data;
-
-        info->frozen = 1;
-}
-
-static void rb532_pata_thaw(struct ata_port *ap)
-{
-        struct rb532_cf_info *info = ap->host->private_data;
-
-        info->frozen = 0;
-}
-
 static irqreturn_t rb532_pata_irq_handler(int irq, void *dev_instance)
 {
         struct ata_host *ah = dev_instance;
@@ -112,8 +60,7 @@ static irqreturn_t rb532_pata_irq_handler(int irq, void *dev_instance)
 
         if (gpio_get_value(info->gpio_line)) {
                 set_irq_type(info->irq, IRQ_TYPE_LEVEL_LOW);
-                if (!info->frozen)
-                        ata_sff_interrupt(info->irq, dev_instance);
+                ata_sff_interrupt(info->irq, dev_instance);
         } else {
                 set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH);
         }
@@ -123,10 +70,7 @@ static irqreturn_t rb532_pata_irq_handler(int irq, void *dev_instance)
 
 static struct ata_port_operations rb532_pata_port_ops = {
         .inherits               = &ata_sff_port_ops,
-        .sff_exec_command       = rb532_pata_exec_command,
-        .sff_data_xfer          = rb532_pata_data_xfer,
-        .freeze                 = rb532_pata_freeze,
-        .thaw                   = rb532_pata_thaw,
+        .sff_data_xfer          = ata_sff_data_xfer32,
 };
 
 /* ------------------------------------------------------------------------ */
@@ -145,7 +89,7 @@ static void rb532_pata_setup_ports(struct ata_host *ah)
         ap = ah->ports[0];
 
         ap->ops         = &rb532_pata_port_ops;
-        ap->pio_mask    = 0x1f; /* PIO4 */
+        ap->pio_mask    = ATA_PIO4;
         ap->flags       = ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO;
 
         ap->ioaddr.cmd_addr     = info->iobase + RB500_CF_REG_BASE;
@@ -160,7 +104,7 @@ static void rb532_pata_setup_ports(struct ata_host *ah)
 
 static __devinit int rb532_pata_driver_probe(struct platform_device *pdev)
 {
-        unsigned int irq;
+        int irq;
         int gpio;
         struct resource *res;
         struct ata_host *ah;