w1-gpio: remove erroneous __exit and __exit_p()
PATCH 1/2 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.
--- drivers/w1/masters/w1-gpio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/w1/masters/w1-gpio.c +2 -2
@@ -158,7 +158,7 @@ static int w1_gpio_probe(struct platform_device *pdev)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_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), }, .probe = w1_gpio_probe, - .remove = __exit_p(w1_gpio_remove), + .remove = w1_gpio_remove, .suspend = w1_gpio_suspend, .resume = w1_gpio_resume, };
Signature · 1 line
1.8.1.1
PATCH 2/2 w1-gpio: fix unused variable warning
Commit 8a1861d997 ("w1-gpio: Simplify & get rid of defines") removed the compile guards from the device-tree id table, thereby generating a warning when building without device-tree support.
--- drivers/w1/masters/w1-gpio.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/w1/masters/w1-gpio.c +2 -0
@@ -47,11 +47,13 @@ static u8 w1_gpio_read_bit(void *data)return gpio_get_value (pdata->pin) ?1 :0 ; } +#if defined(CONFIG_OF )static struct of_device_id w1_gpio_dt_ids[] = { { .compatible ="w1-gpio" }, {} };MODULE_DEVICE_TABLE (of, w1_gpio_dt_ids); +#endif static int w1_gpio_probe_dt (struct platform_device *pdev) {
Signature · 1 line
1.8.1.1
Hi
Quoted 7 lines · Johan Hovold
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 <[email protected]>
Both patches look good to me, thank you
Greg, please pull it into your tree
Signature · 1 line
Evgeniy Polyakov