From 015c635b7584b0c675ced01294da989f3c461e0b Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Mon, 3 Dec 2012 10:34:39 -0800 Subject: [PATCH] --- yaml --- r: 344433 b: refs/heads/master c: e2ec1817484d7448af2d8bf8a8acb144f87d5238 h: refs/heads/master i: 344431: 5e30950675206556058084c399bd227c082ea004 v: v3 --- [refs] | 2 +- trunk/drivers/ata/sata_highbank.c | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index d01e8490274d..a3ea9fb6b7be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56c1d3b77fc83939ab530b8a871e00176fc5b583 +refs/heads/master: e2ec1817484d7448af2d8bf8a8acb144f87d5238 diff --git a/trunk/drivers/ata/sata_highbank.c b/trunk/drivers/ata/sata_highbank.c index 75c0f3cc4a8a..dc7d78eecb19 100644 --- a/trunk/drivers/ata/sata_highbank.c +++ b/trunk/drivers/ata/sata_highbank.c @@ -368,16 +368,6 @@ static int __devinit ahci_highbank_probe(struct platform_device *pdev) return rc; } -static int __devexit ahci_highbank_remove(struct platform_device *pdev) -{ - struct device *dev = &pdev->dev; - struct ata_host *host = dev_get_drvdata(dev); - - ata_host_detach(host); - - return 0; -} - #ifdef CONFIG_PM_SLEEP static int ahci_highbank_suspend(struct device *dev) { @@ -432,7 +422,7 @@ SIMPLE_DEV_PM_OPS(ahci_highbank_pm_ops, ahci_highbank_suspend, ahci_highbank_resume); static struct platform_driver ahci_highbank_driver = { - .remove = __devexit_p(ahci_highbank_remove), + .remove = ata_platform_remove_one, .driver = { .name = "highbank-ahci", .owner = THIS_MODULE,