]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
V4L/DVB: dvb/bt8xx: Clean-up init and exit functions
authorJean Delvare <khali@linux-fr.org>
Tue, 26 Jan 2010 19:46:58 +0000 (16:46 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 26 Feb 2010 18:10:49 +0000 (15:10 -0300)
The init and exit functions are needlessly complex. Remove the bloat:
* Drop irrelevant/outdated comments.
* Remove useless bt878_pci_driver_registered global variable.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/bt8xx/bt878.c

index 2a0886ad787fd62d538ee4a52e769b0d967198bf..99d62094f90865cf7e502d33bcffaa9f5567d278 100644 (file)
@@ -576,8 +576,6 @@ static struct pci_driver bt878_pci_driver = {
       .remove  = __devexit_p(bt878_remove),
 };
 
-static int bt878_pci_driver_registered;
-
 /*******************************/
 /* Module management functions */
 /*******************************/
@@ -585,34 +583,23 @@ static int bt878_pci_driver_registered;
 static int __init bt878_init_module(void)
 {
        bt878_num = 0;
-       bt878_pci_driver_registered = 0;
 
        printk(KERN_INFO "bt878: AUDIO driver version %d.%d.%d loaded\n",
               (BT878_VERSION_CODE >> 16) & 0xff,
               (BT878_VERSION_CODE >> 8) & 0xff,
               BT878_VERSION_CODE & 0xff);
-/*
-       bt878_check_chipset();
-*/
-       /* later we register inside of bt878_find_audio_dma()
-        * because we may want to ignore certain cards */
-       bt878_pci_driver_registered = 1;
+
        return pci_register_driver(&bt878_pci_driver);
 }
 
 static void __exit bt878_cleanup_module(void)
 {
-       if (bt878_pci_driver_registered) {
-               bt878_pci_driver_registered = 0;
-               pci_unregister_driver(&bt878_pci_driver);
-       }
-       return;
+       pci_unregister_driver(&bt878_pci_driver);
 }
 
 module_init(bt878_init_module);
 module_exit(bt878_cleanup_module);
 
-//MODULE_AUTHOR("XXX");
 MODULE_LICENSE("GPL");
 
 /*