From aa815425ab1a345a585132c631de44849c0e7fe9 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Fri, 2 Nov 2012 00:46:22 -0700 Subject: [PATCH] --- yaml --- r: 344429 b: refs/heads/master c: 3e7068da1194543fb4841072838b967e576adc55 h: refs/heads/master i: 344427: 8de8615e05ae269d79a02bbf7ca1ab9c9d3c1343 v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_of_platform.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 5f94fa5824d7..4540e98ce2f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37e1b022bf1c54daf6849deffb65322299493702 +refs/heads/master: 3e7068da1194543fb4841072838b967e576adc55 diff --git a/trunk/drivers/ata/pata_of_platform.c b/trunk/drivers/ata/pata_of_platform.c index 1654dc27e7f8..cd0f9da08637 100644 --- a/trunk/drivers/ata/pata_of_platform.c +++ b/trunk/drivers/ata/pata_of_platform.c @@ -76,11 +76,6 @@ static int __devinit pata_of_platform_probe(struct platform_device *ofdev) reg_shift, pio_mask); } -static int __devexit pata_of_platform_remove(struct platform_device *ofdev) -{ - return __pata_platform_remove(&ofdev->dev); -} - static struct of_device_id pata_of_platform_match[] = { { .compatible = "ata-generic", }, { .compatible = "electra-ide", }, @@ -95,7 +90,7 @@ static struct platform_driver pata_of_platform_driver = { .of_match_table = pata_of_platform_match, }, .probe = pata_of_platform_probe, - .remove = __devexit_p(pata_of_platform_remove), + .remove = ata_platform_remove_one, }; module_platform_driver(pata_of_platform_driver);