Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01230551 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

w1-gpio: remove erroneous __exit and __exit_p() 



Commit 8a1861d9 ("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: default avatarJohan Hovold <jhovold@gmail.com>
Cc: stable <stable@vger.kernel.org> # 3.8
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2d798a3f

drivers/w1/masters/w1-gpio.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

};