mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 08:46:46 +00:00
Code Issues Releases Wiki Activity

[media] Media: remove incorrect __init/__exit markups

Browse source 
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@gmail.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Timo Kokkonen <timo.t.kokkonen@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Dmitry Torokhov 2013-02-26 03:17:27 -03:00 committed by Mauro Carvalho Chehab
parent 4458a54c5e
commit bf30690029
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/media/i2c/adp1653.c
View file

@ -447,7 +447,7 @@ static int adp1653_probe(struct i2c_client *client,
return ret;
}
static int __exit adp1653_remove(struct i2c_client *client)
static int adp1653_remove(struct i2c_client *client)
{
struct v4l2_subdev *subdev = i2c_get_clientdata(client);
struct adp1653_flash *flash = to_adp1653_flash(subdev);
@ -476,7 +476,7 @@ static struct i2c_driver adp1653_i2c_driver = {
.pm = &adp1653_pm_ops,
},
.probe = adp1653_probe,
.remove = __exit_p(adp1653_remove),
.remove = adp1653_remove,
.id_table = adp1653_id_table,
};

4
drivers/media/i2c/smiapp/smiapp-core.c
View file

@ -2833,7 +2833,7 @@ static int smiapp_probe(struct i2c_client *client,
sensor->src->pads, 0);
}
static int __exit smiapp_remove(struct i2c_client *client)
static int smiapp_remove(struct i2c_client *client)
{
struct v4l2_subdev *subdev = i2c_get_clientdata(client);
struct smiapp_sensor *sensor = to_smiapp_sensor(subdev);
@ -2881,7 +2881,7 @@ static struct i2c_driver smiapp_i2c_driver = {
.pm = &smiapp_pm_ops,
},
.probe = smiapp_probe,
.remove = __exit_p(smiapp_remove),
.remove = smiapp_remove,
.id_table = smiapp_id_table,
};

6
drivers/media/platform/soc_camera/omap1_camera.c
View file

@ -1546,7 +1546,7 @@ static struct soc_camera_host_ops omap1_host_ops = {
.poll = omap1_cam_poll,
};
static int __init omap1_cam_probe(struct platform_device *pdev)
static int omap1_cam_probe(struct platform_device *pdev)
{
struct omap1_cam_dev *pcdev;
struct resource *res;
@ -1677,7 +1677,7 @@ static int __init omap1_cam_probe(struct platform_device *pdev)
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);

4
drivers/media/radio/radio-si4713.c
View file

@ -328,7 +328,7 @@ static int radio_si4713_pdriver_probe(struct platform_device *pdev)
}
/* radio_si4713_pdriver_remove - remove the device */
static int __exit radio_si4713_pdriver_remove(struct platform_device *pdev)
static int radio_si4713_pdriver_remove(struct platform_device *pdev)
{
struct v4l2_device *v4l2_dev = platform_get_drvdata(pdev);
struct radio_si4713_device *rsdev = container_of(v4l2_dev,
@ -350,7 +350,7 @@ static struct platform_driver radio_si4713_pdriver = {
.name = "radio-si4713",
},
.probe = radio_si4713_pdriver_probe,
.remove = __exit_p(radio_si4713_pdriver_remove),
.remove = radio_si4713_pdriver_remove,
};
module_platform_driver(radio_si4713_pdriver);

4
drivers/media/rc/ir-rx51.c
View file

@ -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 = {