From f71f5a550a43a81943efbe0032190ec381006b53 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 2 Apr 2012 21:25:46 -0400 Subject: [PATCH] hwmon: use module_pci_driver This patch converts the drivers in drivers/hwmon/* to use module_pci_driver() macro which makes the code smaller and a bit simpler. Signed-off-by: Axel Lin Cc: Andreas Herrmann Cc: Clemens Ladisch Cc: Rudolf Marek Signed-off-by: Guenter Roeck --- drivers/hwmon/fam15h_power.c | 13 +------------ drivers/hwmon/k10temp.c | 13 +------------ drivers/hwmon/k8temp.c | 13 +------------ 3 files changed, 3 insertions(+), 36 deletions(-) diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c index e8e18cab1fb8..6b13f1a4dc27 100644 --- a/drivers/hwmon/fam15h_power.c +++ b/drivers/hwmon/fam15h_power.c @@ -257,15 +257,4 @@ static struct pci_driver fam15h_power_driver = { .remove = __devexit_p(fam15h_power_remove), }; -static int __init fam15h_power_init(void) -{ - return pci_register_driver(&fam15h_power_driver); -} - -static void __exit fam15h_power_exit(void) -{ - pci_unregister_driver(&fam15h_power_driver); -} - -module_init(fam15h_power_init) -module_exit(fam15h_power_exit) +module_pci_driver(fam15h_power_driver); diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index 307bb325dde9..7356b5ec8f67 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -225,15 +225,4 @@ static struct pci_driver k10temp_driver = { .remove = __devexit_p(k10temp_remove), }; -static int __init k10temp_init(void) -{ - return pci_register_driver(&k10temp_driver); -} - -static void __exit k10temp_exit(void) -{ - pci_unregister_driver(&k10temp_driver); -} - -module_init(k10temp_init) -module_exit(k10temp_exit) +module_pci_driver(k10temp_driver); diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c index 575101988751..35aac82ee8eb 100644 --- a/drivers/hwmon/k8temp.c +++ b/drivers/hwmon/k8temp.c @@ -339,19 +339,8 @@ static struct pci_driver k8temp_driver = { .remove = __devexit_p(k8temp_remove), }; -static int __init k8temp_init(void) -{ - return pci_register_driver(&k8temp_driver); -} - -static void __exit k8temp_exit(void) -{ - pci_unregister_driver(&k8temp_driver); -} +module_pci_driver(k8temp_driver); MODULE_AUTHOR("Rudolf Marek "); MODULE_DESCRIPTION("AMD K8 core temperature monitor"); MODULE_LICENSE("GPL"); - -module_init(k8temp_init) -module_exit(k8temp_exit)