From: Jean Delvare <khali@xxxxxxxxxxxx>
Subject: dvb/bt8xx: Clean-up init and exit functions
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@xxxxxxxxxxxx>
---
linux/drivers/media/dvb/bt8xx/bt878.c | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
--- v4l-dvb.orig/linux/drivers/media/dvb/bt8xx/bt878.c 2010-01-26 19:13:38.000000000 +0100
+++ v4l-dvb/linux/drivers/media/dvb/bt8xx/bt878.c 2010-01-26 20:40:37.000000000 +0100
@@ -580,8 +580,6 @@ static struct pci_driver bt878_pci_drive
.remove = __devexit_p(bt878_remove),
};
-static int bt878_pci_driver_registered;
-
/*******************************/
/* Module management functions */
/*******************************/
@@ -589,34 +587,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");
/*
--
Jean Delvare
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
