aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/radio
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2013-02-26 01:17:27 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-18 15:59:59 -0400
commitbf30690029a3b8572a6fc2facb77fbde86992988 (patch)
tree6be672e18189c806c210d6ded581cee38f9c1524 /drivers/media/radio
parent4458a54c5edce2a9bdf826273ceb7f4b3b7278c6 (diff)
[media] Media: remove incorrect __init/__exit markups
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>
Diffstat (limited to 'drivers/media/radio')
-rw-r--r--drivers/media/radio/radio-si4713.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-si4713.c b/drivers/media/radio/radio-si4713.c
index 1507c9d508d7..8ae8442d6f97 100644
--- a/drivers/media/radio/radio-si4713.c
+++ b/drivers/media/radio/radio-si4713.c
@@ -328,7 +328,7 @@ exit:
328} 328}
329 329
330/* radio_si4713_pdriver_remove - remove the device */ 330/* radio_si4713_pdriver_remove - remove the device */
331static int __exit radio_si4713_pdriver_remove(struct platform_device *pdev) 331static int radio_si4713_pdriver_remove(struct platform_device *pdev)
332{ 332{
333 struct v4l2_device *v4l2_dev = platform_get_drvdata(pdev); 333 struct v4l2_device *v4l2_dev = platform_get_drvdata(pdev);
334 struct radio_si4713_device *rsdev = container_of(v4l2_dev, 334 struct radio_si4713_device *rsdev = container_of(v4l2_dev,
@@ -350,7 +350,7 @@ static struct platform_driver radio_si4713_pdriver = {
350 .name = "radio-si4713", 350 .name = "radio-si4713",
351 }, 351 },
352 .probe = radio_si4713_pdriver_probe, 352 .probe = radio_si4713_pdriver_probe,
353 .remove = __exit_p(radio_si4713_pdriver_remove), 353 .remove = radio_si4713_pdriver_remove,
354}; 354};
355 355
356module_platform_driver(radio_si4713_pdriver); 356module_platform_driver(radio_si4713_pdriver);