aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_mpc52xx.c
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2012-11-02 03:46:21 -0400
committerJeff Garzik <jgarzik@redhat.com>2012-12-03 05:15:22 -0500
commit37e1b022bf1c54daf6849deffb65322299493702 (patch)
tree6241a97f52712c39e25f7998192abe6953503763 /drivers/ata/pata_mpc52xx.c
parent58d0ff2f05d6915c455b5fe7c404e299fe34993b (diff)
pata_mpc52xx: utilize common ata_platform_remove_one()
Signed-off-by: Brian Norris <computersforpeace@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/pata_mpc52xx.c')
-rw-r--r--drivers/ata/pata_mpc52xx.c17
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
666static struct mpc52xx_ata_priv *
667mpc52xx_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)
815static int 803static int
816mpc52xx_ata_remove(struct platform_device *op) 804mpc52xx_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);