diff options
author | Johan Hovold <jhovold@gmail.com> | 2013-03-08 05:07:59 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-12 19:20:46 -0400 |
commit | 01230551e7c2fb9a1c2519b356d703851049cbe0 (patch) | |
tree | 3035138abd333894cd6275dc3a8847cee1628969 /drivers/w1 | |
parent | 2d798a3f20ae992b0b69a2b68c04ada397c32ed4 (diff) |
w1-gpio: remove erroneous __exit and __exit_p()
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>
Diffstat (limited to 'drivers/w1')
-rw-r--r-- | drivers/w1/masters/w1-gpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c index d39dfa4cc235..012817abb12f 100644 --- a/drivers/w1/masters/w1-gpio.c +++ b/drivers/w1/masters/w1-gpio.c | |||
@@ -158,7 +158,7 @@ static int w1_gpio_probe(struct platform_device *pdev) | |||
158 | return err; | 158 | return err; |
159 | } | 159 | } |
160 | 160 | ||
161 | static int __exit w1_gpio_remove(struct platform_device *pdev) | 161 | static int w1_gpio_remove(struct platform_device *pdev) |
162 | { | 162 | { |
163 | struct w1_bus_master *master = platform_get_drvdata(pdev); | 163 | struct w1_bus_master *master = platform_get_drvdata(pdev); |
164 | struct w1_gpio_platform_data *pdata = pdev->dev.platform_data; | 164 | struct w1_gpio_platform_data *pdata = pdev->dev.platform_data; |
@@ -210,7 +210,7 @@ static struct platform_driver w1_gpio_driver = { | |||
210 | .of_match_table = of_match_ptr(w1_gpio_dt_ids), | 210 | .of_match_table = of_match_ptr(w1_gpio_dt_ids), |
211 | }, | 211 | }, |
212 | .probe = w1_gpio_probe, | 212 | .probe = w1_gpio_probe, |
213 | .remove = __exit_p(w1_gpio_remove), | 213 | .remove = w1_gpio_remove, |
214 | .suspend = w1_gpio_suspend, | 214 | .suspend = w1_gpio_suspend, |
215 | .resume = w1_gpio_resume, | 215 | .resume = w1_gpio_resume, |
216 | }; | 216 | }; |