From 8de8615e05ae269d79a02bbf7ca1ab9c9d3c1343 Mon Sep 17 00:00:00 2001
From: Brian Norris <computersforpeace@gmail.com>
Date: Fri, 2 Nov 2012 00:46:20 -0700
Subject: [PATCH] --- yaml --- r: 344427 b: refs/heads/master c:
 58d0ff2f05d6915c455b5fe7c404e299fe34993b h: refs/heads/master i:   344425:
 cbe63240e1d3f6b8979b23e8e95e2e5ba4ee56c7   344423:
 f56e995d078eefa9576d3227b96c936f72dc184f v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/ata/pata_ixp4xx_cf.c | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 36d3b46eeda3..e8fd2c100949 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83291d65cbeadda2bd600b6c500df7046dcd6fa9
+refs/heads/master: 58d0ff2f05d6915c455b5fe7c404e299fe34993b
diff --git a/trunk/drivers/ata/pata_ixp4xx_cf.c b/trunk/drivers/ata/pata_ixp4xx_cf.c
index badb1789a918..0566e67b5e12 100644
--- a/trunk/drivers/ata/pata_ixp4xx_cf.c
+++ b/trunk/drivers/ata/pata_ixp4xx_cf.c
@@ -187,22 +187,13 @@ static __devinit int ixp4xx_pata_probe(struct platform_device *pdev)
 	return ata_host_activate(host, irq, ata_sff_interrupt, 0, &ixp4xx_sht);
 }
 
-static __devexit int ixp4xx_pata_remove(struct platform_device *dev)
-{
-	struct ata_host *host = platform_get_drvdata(dev);
-
-	ata_host_detach(host);
-
-	return 0;
-}
-
 static struct platform_driver ixp4xx_pata_platform_driver = {
 	.driver	 = {
 		.name   = DRV_NAME,
 		.owner  = THIS_MODULE,
 	},
 	.probe		= ixp4xx_pata_probe,
-	.remove		= __devexit_p(ixp4xx_pata_remove),
+	.remove		= ata_platform_remove_one,
 };
 
 module_platform_driver(ixp4xx_pata_platform_driver);