powerpc/pata_mpc52xx: use linux/of_platform.h instead of asm

[linux-2.6-omap-h63xx.git] / drivers / ata / pata_mpc52xx.c

diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index ac7c0822b1a78fbef7c835624e782205f1908b66..a9e827356d0681bfd4c64bf8bf6e02bb32513318 100644 (file)
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -16,10 +16,10 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/libata.h>
+#include <linux/of_platform.h>
 
 #include <asm/types.h>
 #include <asm/prom.h>
-#include <asm/of_platform.h>
 #include <asm/mpc52xx.h>
 
 
@@ -252,28 +252,18 @@ mpc52xx_ata_dev_select(struct ata_port *ap, unsigned int device)
        if (device != priv->csel)
                mpc52xx_ata_apply_timings(priv, device);
 
-       ata_std_dev_select(ap,device);
+       ata_sff_dev_select(ap,device);
 }
 
-static void
-mpc52xx_ata_error_handler(struct ata_port *ap)
-{
-       ata_bmdma_drive_eh(ap, ata_std_prereset, ata_std_softreset, NULL,
-                       ata_std_postreset);
-}
-
-
-
 static struct scsi_host_template mpc52xx_ata_sht = {
        ATA_PIO_SHT(DRV_NAME),
 };
 
 static struct ata_port_operations mpc52xx_ata_port_ops = {
        .inherits               = &ata_sff_port_ops,
-       .dev_select             = mpc52xx_ata_dev_select,
+       .sff_dev_select         = mpc52xx_ata_dev_select,
        .cable_detect           = ata_cable_40wire,
        .set_piomode            = mpc52xx_ata_set_piomode,
-       .error_handler          = mpc52xx_ata_error_handler,
        .post_internal_cmd      = ATA_OP_NULL,
 };
 
@@ -315,7 +305,7 @@ mpc52xx_ata_init_one(struct device *dev, struct mpc52xx_ata_priv *priv,
        ata_port_desc(ap, "ata_regs 0x%lx", raw_ata_regs);
 
        /* activate host */
-       return ata_host_activate(host, priv->ata_irq, ata_interrupt, 0,
+       return ata_host_activate(host, priv->ata_irq, ata_sff_interrupt, 0,
                                 &mpc52xx_ata_sht);
 }