On 02.25 2013 23:17:27, Dmitry Torokhov wrote: > Even if bus is not hot-pluggable, the devices can be unbound from the > driver via sysfs, so we should not be using __exit annotations on > remove() methods. The only exception is drivers registered with > platform_driver_probe() which specifically disables sysfs bind/unbind > attributes. > > Similarly probe() methods should not be marked __init unless > platform_driver_probe() is used. > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx> > --- > > v1->v2: removed __init markup on omap1_cam_probe() that was pointed out > by Guennadi Liakhovetski. > > drivers/media/i2c/adp1653.c | 4 ++-- > drivers/media/i2c/smiapp/smiapp-core.c | 4 ++-- > drivers/media/platform/soc_camera/omap1_camera.c | 6 +++--- > drivers/media/radio/radio-si4713.c | 4 ++-- > drivers/media/rc/ir-rx51.c | 4 ++-- > 5 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/drivers/media/rc/ir-rx51.c b/drivers/media/rc/ir-rx51.c > index 8ead492..31b955b 100644 > --- a/drivers/media/rc/ir-rx51.c > +++ b/drivers/media/rc/ir-rx51.c > @@ -464,14 +464,14 @@ static int lirc_rx51_probe(struct platform_device *dev) > return 0; > } > > -static int __exit lirc_rx51_remove(struct platform_device *dev) > +static int lirc_rx51_remove(struct platform_device *dev) > { > return lirc_unregister_driver(lirc_rx51_driver.minor); > } > > struct platform_driver lirc_rx51_platform_driver = { > .probe = lirc_rx51_probe, > - .remove = __exit_p(lirc_rx51_remove), > + .remove = lirc_rx51_remove, > .suspend = lirc_rx51_suspend, > .resume = lirc_rx51_resume, > .driver = { For ir-rx51: Acked-by: Timo Kokkonen <timo.t.kokkonen@xxxxxx> Thanks! -Timo -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html