diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-09 19:55:17 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-09 19:55:17 +0100 |
| commit | b675b3667f6729dcd1036a2a129b35445947f905 (patch) | |
| tree | 0d58791e9063d3ca2c352da6f3e7df2bdb876f9d /drivers/media/dvb/dvb-usb/nova-t-usb2.c | |
| parent | Input: max8925_onkey - avoid accessing input device too early (diff) | |
| parent | Linux 3.3-rc6 (diff) | |
| download | linux-b675b3667f6729dcd1036a2a129b35445947f905.tar.xz linux-b675b3667f6729dcd1036a2a129b35445947f905.zip | |
Merge commit 'v3.3-rc6' into next
Diffstat (limited to 'drivers/media/dvb/dvb-usb/nova-t-usb2.c')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/nova-t-usb2.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/drivers/media/dvb/dvb-usb/nova-t-usb2.c b/drivers/media/dvb/dvb-usb/nova-t-usb2.c index 21384da6570e..6c55384e2fca 100644 --- a/drivers/media/dvb/dvb-usb/nova-t-usb2.c +++ b/drivers/media/dvb/dvb-usb/nova-t-usb2.c @@ -225,26 +225,7 @@ static struct usb_driver nova_t_driver = { .id_table = nova_t_table, }; -/* module stuff */ -static int __init nova_t_module_init(void) -{ - int result; - if ((result = usb_register(&nova_t_driver))) { - err("usb_register failed. Error number %d",result); - return result; - } - - return 0; -} - -static void __exit nova_t_module_exit(void) -{ - /* deregister this driver from the USB subsystem */ - usb_deregister(&nova_t_driver); -} - -module_init (nova_t_module_init); -module_exit (nova_t_module_exit); +module_usb_driver(nova_t_driver); MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>"); MODULE_DESCRIPTION("Hauppauge WinTV-NOVA-T usb2"); |