aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/usbvision/usbvision-video.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/usb/usbvision/usbvision-video.c')
-rw-r--r--drivers/media/usb/usbvision/usbvision-video.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/usb/usbvision/usbvision-video.c b/drivers/media/usb/usbvision/usbvision-video.c
index 5c36a57e659..ad7f7448072 100644
--- a/drivers/media/usb/usbvision/usbvision-video.c
+++ b/drivers/media/usb/usbvision/usbvision-video.c
@@ -1363,7 +1363,7 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision)
1363} 1363}
1364 1364
1365/* register video4linux devices */ 1365/* register video4linux devices */
1366static int __devinit usbvision_register_video(struct usb_usbvision *usbvision) 1366static int usbvision_register_video(struct usb_usbvision *usbvision)
1367{ 1367{
1368 /* Video Device: */ 1368 /* Video Device: */
1369 usbvision->vdev = usbvision_vdev_init(usbvision, 1369 usbvision->vdev = usbvision_vdev_init(usbvision,
@@ -1510,8 +1510,8 @@ static void usbvision_configure_video(struct usb_usbvision *usbvision)
1510 * if it looks like USBVISION video device 1510 * if it looks like USBVISION video device
1511 * 1511 *
1512 */ 1512 */
1513static int __devinit usbvision_probe(struct usb_interface *intf, 1513static int usbvision_probe(struct usb_interface *intf,
1514 const struct usb_device_id *devid) 1514 const struct usb_device_id *devid)
1515{ 1515{
1516 struct usb_device *dev = usb_get_dev(interface_to_usbdev(intf)); 1516 struct usb_device *dev = usb_get_dev(interface_to_usbdev(intf));
1517 struct usb_interface *uif; 1517 struct usb_interface *uif;
@@ -1619,7 +1619,7 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
1619 * with no ill consequences. 1619 * with no ill consequences.
1620 * 1620 *
1621 */ 1621 */
1622static void __devexit usbvision_disconnect(struct usb_interface *intf) 1622static void usbvision_disconnect(struct usb_interface *intf)
1623{ 1623{
1624 struct usb_usbvision *usbvision = to_usbvision(usb_get_intfdata(intf)); 1624 struct usb_usbvision *usbvision = to_usbvision(usb_get_intfdata(intf));
1625 1625
@@ -1664,7 +1664,7 @@ static struct usb_driver usbvision_driver = {
1664 .name = "usbvision", 1664 .name = "usbvision",
1665 .id_table = usbvision_table, 1665 .id_table = usbvision_table,
1666 .probe = usbvision_probe, 1666 .probe = usbvision_probe,
1667 .disconnect = __devexit_p(usbvision_disconnect), 1667 .disconnect = usbvision_disconnect,
1668}; 1668};
1669 1669
1670/* 1670/*