lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

w1-gpio: remove erroneous __exit and __exit_p()

Browse Source 
Commit 8a1861d997 ("w1-gpio: Simplify & get rid of defines") changed
(apparently unknowingly) the driver to a hotpluggable platform-device
driver but did not not update the section markers for probe and remove
(to __devinit/exit, which have since been removed). A later commit fixed
the section mismatch for probe, but left remove marked with __exit.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Cc: stable <stable@vger.kernel.org> # 3.8
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold
2013-03-08 11:07:59 +01:00
committed by Greg Kroah-Hartman
parent 2d798a3f20
commit 01230551e7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/w1/masters/w1-gpio.c
View File

@@ -158,7 +158,7 @@ static int w1_gpio_probe(struct platform_device *pdev)
return err; return err;
} }
static int __exit w1_gpio_remove(struct platform_device *pdev) static int w1_gpio_remove(struct platform_device *pdev)
{ {
struct w1_bus_master *master = platform_get_drvdata(pdev); struct w1_bus_master *master = platform_get_drvdata(pdev);
struct w1_gpio_platform_data *pdata = pdev->dev.platform_data; struct w1_gpio_platform_data *pdata = pdev->dev.platform_data;
@@ -210,7 +210,7 @@ static struct platform_driver w1_gpio_driver = {
.of_match_table = of_match_ptr(w1_gpio_dt_ids), .of_match_table = of_match_ptr(w1_gpio_dt_ids),
}, },
.probe = w1_gpio_probe, .probe = w1_gpio_probe,
.remove = __exit_p(w1_gpio_remove), .remove = w1_gpio_remove,
.suspend = w1_gpio_suspend, .suspend = w1_gpio_suspend,
.resume = w1_gpio_resume, .resume = w1_gpio_resume,
}; };