Re: [PATCH] Media: remove incorrect __exit markups

From: Dmitry Torokhov
Date: Mon Feb 25 2013 - 12:35:30 EST


On Mon, Feb 25, 2013 at 08:49:26AM +0100, Guennadi Liakhovetski wrote:
> Hi Dmitry
>
> On Sun, 24 Feb 2013, 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.
> >
> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
> > ---
> > drivers/media/i2c/adp1653.c | 4 ++--
> > drivers/media/i2c/smiapp/smiapp-core.c | 4 ++--
> > drivers/media/platform/soc_camera/omap1_camera.c | 4 ++--
> > drivers/media/radio/radio-si4713.c | 4 ++--
> > drivers/media/rc/ir-rx51.c | 4 ++--
> > 5 files changed, 10 insertions(+), 10 deletions(-)
>
> [snip]
>
> > diff --git a/drivers/media/platform/soc_camera/omap1_camera.c b/drivers/media/platform/soc_camera/omap1_camera.c
> > index 39a77f0..5f548ac 100644
> > --- a/drivers/media/platform/soc_camera/omap1_camera.c
> > +++ b/drivers/media/platform/soc_camera/omap1_camera.c
> > @@ -1677,7 +1677,7 @@ exit:
> > return err;
> > }
> >
> > -static int __exit omap1_cam_remove(struct platform_device *pdev)
> > +static int omap1_cam_remove(struct platform_device *pdev)
> > {
> > struct soc_camera_host *soc_host = to_soc_camera_host(&pdev->dev);
> > struct omap1_cam_dev *pcdev = container_of(soc_host,
> > @@ -1709,7 +1709,7 @@ static struct platform_driver omap1_cam_driver = {
> > .name = DRIVER_NAME,
> > },
> > .probe = omap1_cam_probe,
> > - .remove = __exit_p(omap1_cam_remove),
> > + .remove = omap1_cam_remove,
> > };
> >
> > module_platform_driver(omap1_cam_driver);
>
> This looks correct, but don't we also have to remove __init from
> omap1_cam_probe()? Or would that be a separate patch?

Thanks Guennadi, I missed that one, will update the patch.

--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/