diff options
-rw-r--r-- | drivers/ata/pata_mpc52xx.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c index d2c102fd4330..ec67f54dc56f 100644 --- a/drivers/ata/pata_mpc52xx.c +++ b/drivers/ata/pata_mpc52xx.c | |||
@@ -663,18 +663,6 @@ mpc52xx_ata_init_one(struct device *dev, struct mpc52xx_ata_priv *priv, | |||
663 | &mpc52xx_ata_sht); | 663 | &mpc52xx_ata_sht); |
664 | } | 664 | } |
665 | 665 | ||
666 | static struct mpc52xx_ata_priv * | ||
667 | mpc52xx_ata_remove_one(struct device *dev) | ||
668 | { | ||
669 | struct ata_host *host = dev_get_drvdata(dev); | ||
670 | struct mpc52xx_ata_priv *priv = host->private_data; | ||
671 | |||
672 | ata_host_detach(host); | ||
673 | |||
674 | return priv; | ||
675 | } | ||
676 | |||
677 | |||
678 | /* ======================================================================== */ | 666 | /* ======================================================================== */ |
679 | /* OF Platform driver */ | 667 | /* OF Platform driver */ |
680 | /* ======================================================================== */ | 668 | /* ======================================================================== */ |
@@ -815,11 +803,12 @@ mpc52xx_ata_probe(struct platform_device *op) | |||
815 | static int | 803 | static int |
816 | mpc52xx_ata_remove(struct platform_device *op) | 804 | mpc52xx_ata_remove(struct platform_device *op) |
817 | { | 805 | { |
818 | struct mpc52xx_ata_priv *priv; | 806 | struct ata_host *host = platform_get_drvdata(op); |
807 | struct mpc52xx_ata_priv *priv = host->private_data; | ||
819 | int task_irq; | 808 | int task_irq; |
820 | 809 | ||
821 | /* Deregister the ATA interface */ | 810 | /* Deregister the ATA interface */ |
822 | priv = mpc52xx_ata_remove_one(&op->dev); | 811 | ata_platform_remove_one(op); |
823 | 812 | ||
824 | /* Clean up DMA */ | 813 | /* Clean up DMA */ |
825 | task_irq = bcom_get_task_irq(priv->dmatsk); | 814 | task_irq = bcom_get_task_irq(priv->dmatsk); |