| Message ID | 20130220085008.GA11025@core.coreip.homeip.net |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Feb 20, 2013 at 12:50:10AM -0800, Dmitry Torokhov wrote: > The remove() methods should not be marked __exit unless we are using > platform_driver_probe() which disables unbinding device from driver > via sysfs. > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Eeks, I broke this with my very first linux patch years ago :) Applied to -next, thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 1034d93..4a79e76 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -1215,7 +1215,7 @@ emalloc: return ret; } -static int __exit i2c_pxa_remove(struct platform_device *dev) +static int i2c_pxa_remove(struct platform_device *dev) { struct pxa_i2c *i2c = platform_get_drvdata(dev); @@ -1269,7 +1269,7 @@ static const struct dev_pm_ops i2c_pxa_dev_pm_ops = { static struct platform_driver i2c_pxa_driver = { .probe = i2c_pxa_probe, - .remove = __exit_p(i2c_pxa_remove), + .remove = i2c_pxa_remove, .driver = { .name = "pxa2xx-i2c", .owner = THIS_MODULE,
The remove() methods should not be marked __exit unless we are using platform_driver_probe() which disables unbinding device from driver via sysfs. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> --- Compiled only, no hardware. drivers/i2c/busses/i2c-pxa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)