Patchwork [v2,12/14] sata_highbank: utilize common ata_platform_remove_one()

login
register
mail settings
Submitter Brian Norris
Date Nov. 2, 2012, 7:12 p.m.
Message ID <1351883526-32412-1-git-send-email-computersforpeace@gmail.com>
Download mbox | patch
Permalink /patch/196747/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Brian Norris - Nov. 2, 2012, 7:12 p.m.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---
v2: fix whitespace

 drivers/ata/sata_highbank.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
Jeff Garzik - Dec. 3, 2012, 10:17 a.m.
On 11/02/2012 03:12 PM, Brian Norris wrote:
> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> ---
> v2: fix whitespace
>
>   drivers/ata/sata_highbank.c | 12 +-----------
>   1 file changed, 1 insertion(+), 11 deletions(-)

applied patches 1-11

patch #12 failed to apply (even manually), so I stopped there



--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Brian Norris - Dec. 3, 2012, 6:12 p.m.
On Mon, Dec 3, 2012 at 2:17 AM, Jeff Garzik <jgarzik@pobox.com> wrote:
> On 11/02/2012 03:12 PM, Brian Norris wrote:
>>
>> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
>> ---
>> v2: fix whitespace
>>
>>   drivers/ata/sata_highbank.c | 12 +-----------
>>   1 file changed, 1 insertion(+), 11 deletions(-)
>
>
> applied patches 1-11

Thanks.

> patch #12 failed to apply (even manually), so I stopped there

There was just a trivial change to the #ifdef next to the (unrelated,
but adjacent) ahci_highbank_suspend function. I'll resend 12-14, as a
v2 series, plus a (new) compile-error fix for pata_of_platform.

BTW, Tejun posted his "Ack" in reply to the original series. I'll
include it in my version 2 of the original patches, but I noticed you
didn't add it in libata-dev.git.

Brian
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c
index 0d7c4c2..64c7276 100644
--- a/drivers/ata/sata_highbank.c
+++ b/drivers/ata/sata_highbank.c
@@ -368,16 +368,6 @@  err0:
 	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
 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,