aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/rc
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-03 17:22:22 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-15 06:53:51 -0400
commitcd624c7b7ce3c3cfa09845dcefbe856bf9f9c4c6 (patch)
tree17297280d394c1c01c98f61d1f0564a9bba77413 /drivers/media/rc
parent14f2226022be6b169faeee3f0f6ca848170fdb3d (diff)
[media] drivers/media: add missing __devexit_p() annotations
Drivers that refer to a __devexit function in an operations structure need to annotate that pointer with __devexit_p so replace it with a NULL pointer when the section gets discarded. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/rc')
-rw-r--r--drivers/media/rc/imon.c2
-rw-r--r--drivers/media/rc/mceusb.c2
-rw-r--r--drivers/media/rc/redrat3.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index 7f26fdf2e54e..5dd0386604f0 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -255,7 +255,7 @@ static struct usb_device_id imon_usb_id_table[] = {
255static struct usb_driver imon_driver = { 255static struct usb_driver imon_driver = {
256 .name = MOD_NAME, 256 .name = MOD_NAME,
257 .probe = imon_probe, 257 .probe = imon_probe,
258 .disconnect = imon_disconnect, 258 .disconnect = __devexit_p(imon_disconnect),
259 .suspend = imon_suspend, 259 .suspend = imon_suspend,
260 .resume = imon_resume, 260 .resume = imon_resume,
261 .id_table = imon_usb_id_table, 261 .id_table = imon_usb_id_table,
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index 3e29cc55fdd1..84e06d3aa696 100644
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -1442,7 +1442,7 @@ static int mceusb_dev_resume(struct usb_interface *intf)
1442static struct usb_driver mceusb_dev_driver = { 1442static struct usb_driver mceusb_dev_driver = {
1443 .name = DRIVER_NAME, 1443 .name = DRIVER_NAME,
1444 .probe = mceusb_dev_probe, 1444 .probe = mceusb_dev_probe,
1445 .disconnect = mceusb_dev_disconnect, 1445 .disconnect = __devexit_p(mceusb_dev_disconnect),
1446 .suspend = mceusb_dev_suspend, 1446 .suspend = mceusb_dev_suspend,
1447 .resume = mceusb_dev_resume, 1447 .resume = mceusb_dev_resume,
1448 .reset_resume = mceusb_dev_resume, 1448 .reset_resume = mceusb_dev_resume,
diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
index ad95c67a4dba..2878b0ed9741 100644
--- a/drivers/media/rc/redrat3.c
+++ b/drivers/media/rc/redrat3.c
@@ -1277,7 +1277,7 @@ static int redrat3_dev_resume(struct usb_interface *intf)
1277static struct usb_driver redrat3_dev_driver = { 1277static struct usb_driver redrat3_dev_driver = {
1278 .name = DRIVER_NAME, 1278 .name = DRIVER_NAME,
1279 .probe = redrat3_dev_probe, 1279 .probe = redrat3_dev_probe,
1280 .disconnect = redrat3_dev_disconnect, 1280 .disconnect = __devexit_p(redrat3_dev_disconnect),
1281 .suspend = redrat3_dev_suspend, 1281 .suspend = redrat3_dev_suspend,
1282 .resume = redrat3_dev_resume, 1282 .resume = redrat3_dev_resume,
1283 .reset_resume = redrat3_dev_resume, 1283 .reset_resume = redrat3_dev_resume,