Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Arnd Bergmann and committed by
Mauro Carvalho Chehab
cd624c7b 14f22260

+7 -7
+1 -1
drivers/media/dvb/ddbridge/ddbridge-core.c
··· 1695 1695 .name = "DDBridge", 1696 1696 .id_table = ddb_id_tbl, 1697 1697 .probe = ddb_probe, 1698 - .remove = ddb_remove, 1698 + .remove = __devexit_p(ddb_remove), 1699 1699 }; 1700 1700 1701 1701 static __init int module_init_ddbridge(void)
+1 -1
drivers/media/radio/radio-timb.c
··· 223 223 .owner = THIS_MODULE, 224 224 }, 225 225 .probe = timbradio_probe, 226 - .remove = timbradio_remove, 226 + .remove = __devexit_p(timbradio_remove), 227 227 }; 228 228 229 229 module_platform_driver(timbradio_platform_driver);
+1 -1
drivers/media/radio/saa7706h.c
··· 430 430 .name = DRIVER_NAME, 431 431 }, 432 432 .probe = saa7706h_probe, 433 - .remove = saa7706h_remove, 433 + .remove = __devexit_p(saa7706h_remove), 434 434 .id_table = saa7706h_id, 435 435 }; 436 436
+1 -1
drivers/media/radio/tef6862.c
··· 211 211 .name = DRIVER_NAME, 212 212 }, 213 213 .probe = tef6862_probe, 214 - .remove = tef6862_remove, 214 + .remove = __devexit_p(tef6862_remove), 215 215 .id_table = tef6862_id, 216 216 }; 217 217
+1 -1
drivers/media/rc/imon.c
··· 255 255 static struct usb_driver imon_driver = { 256 256 .name = MOD_NAME, 257 257 .probe = imon_probe, 258 - .disconnect = imon_disconnect, 258 + .disconnect = __devexit_p(imon_disconnect), 259 259 .suspend = imon_suspend, 260 260 .resume = imon_resume, 261 261 .id_table = imon_usb_id_table,
+1 -1
drivers/media/rc/mceusb.c
··· 1442 1442 static struct usb_driver mceusb_dev_driver = { 1443 1443 .name = DRIVER_NAME, 1444 1444 .probe = mceusb_dev_probe, 1445 - .disconnect = mceusb_dev_disconnect, 1445 + .disconnect = __devexit_p(mceusb_dev_disconnect), 1446 1446 .suspend = mceusb_dev_suspend, 1447 1447 .resume = mceusb_dev_resume, 1448 1448 .reset_resume = mceusb_dev_resume,
+1 -1
drivers/media/rc/redrat3.c
··· 1277 1277 static struct usb_driver redrat3_dev_driver = { 1278 1278 .name = DRIVER_NAME, 1279 1279 .probe = redrat3_dev_probe, 1280 - .disconnect = redrat3_dev_disconnect, 1280 + .disconnect = __devexit_p(redrat3_dev_disconnect), 1281 1281 .suspend = redrat3_dev_suspend, 1282 1282 .resume = redrat3_dev_resume, 1283 1283 .reset_resume = redrat3_dev_resume,