diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-02-26 01:17:27 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-18 15:59:59 -0400 |
commit | bf30690029a3b8572a6fc2facb77fbde86992988 (patch) | |
tree | 6be672e18189c806c210d6ded581cee38f9c1524 /drivers/media/rc | |
parent | 4458a54c5edce2a9bdf826273ceb7f4b3b7278c6 (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/rc')
-rw-r--r-- | drivers/media/rc/ir-rx51.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/rc/ir-rx51.c b/drivers/media/rc/ir-rx51.c index 8ead492d03aa..31b955bf7664 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) | |||
464 | return 0; | 464 | return 0; |
465 | } | 465 | } |
466 | 466 | ||
467 | static int __exit lirc_rx51_remove(struct platform_device *dev) | 467 | static int lirc_rx51_remove(struct platform_device *dev) |
468 | { | 468 | { |
469 | return lirc_unregister_driver(lirc_rx51_driver.minor); | 469 | return lirc_unregister_driver(lirc_rx51_driver.minor); |
470 | } | 470 | } |
471 | 471 | ||
472 | struct platform_driver lirc_rx51_platform_driver = { | 472 | struct platform_driver lirc_rx51_platform_driver = { |
473 | .probe = lirc_rx51_probe, | 473 | .probe = lirc_rx51_probe, |
474 | .remove = __exit_p(lirc_rx51_remove), | 474 | .remove = lirc_rx51_remove, |
475 | .suspend = lirc_rx51_suspend, | 475 | .suspend = lirc_rx51_suspend, |
476 | .resume = lirc_rx51_resume, | 476 | .resume = lirc_rx51_resume, |
477 | .driver = { | 477 | .driver = { |