Skip to contentSkip to conversation

hwmon: convert drivers/hwmon/* to use module_platform_driver()

PATCH Applied Axel Lin 3 participants 3 messages Nov 25, 2011 – Nov 27, 2011

Subsystems (4)
Arm Samsung Exynos Hardware monitoring Wolfson microelectronics drivers Smsc SCH5627 hardware monitor driver
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 hwmon: convert drivers/hwmon/* to use module_platform_driver()

This patch converts the drivers in drivers/hwmon/* to use the module_platform_driver() macro which makes the code smaller and a bit simpler.

Cc Donggeun Kim <[email protected]>
Cc Simon Guinot <[email protected]>
Cc Lars-Peter Clausen <[email protected]>
Cc MyungJoo Ham <[email protected]>
Cc Ben Dooks <[email protected]>
Cc Hans de Goede <[email protected]>
Cc J Keerthy <[email protected]>
Cc David S. Miller <[email protected]>
Cc Mark Brown <[email protected]>
Signed-off-by Axel Lin <[email protected]>
---
 drivers/hwmon/exynos4_tmu.c        |   12 +-----------
 drivers/hwmon/gpio-fan.c           |   13 +------------
 drivers/hwmon/jz4740-hwmon.c       |   12 +-----------
 drivers/hwmon/ntc_thermistor.c     |   14 +-------------
 drivers/hwmon/s3c-hwmon.c          |   13 +------------
 drivers/hwmon/sch5627.c            |   13 +------------
 drivers/hwmon/sch5636.c            |   13 +------------
 drivers/hwmon/twl4030-madc-hwmon.c |   14 +-------------
 drivers/hwmon/ultra45_env.c        |   13 +------------
 drivers/hwmon/wm831x-hwmon.c       |   12 +-----------
 drivers/hwmon/wm8350-hwmon.c       |   12 +-----------
 11 files changed, 11 insertions(+), 130 deletions(-)
drivers/hwmon/exynos4_tmu.c +1 -11
index faa0884..f2359a0 100644
@@ -506,17 +506,7 @@ static struct platform_driver exynos4_tmu_driver = {
 	.resume = exynos4_tmu_resume,
 };
 
-static int __init exynos4_tmu_driver_init(void)
-{
-	return platform_driver_register(&exynos4_tmu_driver);
-}
-module_init(exynos4_tmu_driver_init);
-
-static void __exit exynos4_tmu_driver_exit(void)
-{
-	platform_driver_unregister(&exynos4_tmu_driver);
-}
-module_exit(exynos4_tmu_driver_exit);
+module_platform_driver(exynos4_tmu_driver);
 
 MODULE_DESCRIPTION("EXYNOS4 TMU Driver");
 MODULE_AUTHOR("Donggeun Kim <[email protected]>");
drivers/hwmon/gpio-fan.c +1 -12
index 89aa9fb..9ba38f3 100644
@@ -539,18 +539,7 @@ static struct platform_driver gpio_fan_driver = {
 	},
 };
 
-static int __init gpio_fan_init(void)
-{
-	return platform_driver_register(&gpio_fan_driver);
-}
-
-static void __exit gpio_fan_exit(void)
-{
-	platform_driver_unregister(&gpio_fan_driver);
-}
-
-module_init(gpio_fan_init);
-module_exit(gpio_fan_exit);
+module_platform_driver(gpio_fan_driver);
 
 MODULE_AUTHOR("Simon Guinot <[email protected]>");
 MODULE_DESCRIPTION("GPIO FAN driver");
drivers/hwmon/jz4740-hwmon.c +1 -11
index fea292d..7a48b1e 100644
@@ -212,17 +212,7 @@ struct platform_driver jz4740_hwmon_driver = {
 	},
 };
 
-static int __init jz4740_hwmon_init(void)
-{
-	return platform_driver_register(&jz4740_hwmon_driver);
-}
-module_init(jz4740_hwmon_init);
-
-static void __exit jz4740_hwmon_exit(void)
-{
-	platform_driver_unregister(&jz4740_hwmon_driver);
-}
-module_exit(jz4740_hwmon_exit);
+module_platform_driver(jz4740_hwmon_driver);
 
 MODULE_DESCRIPTION("JZ4740 SoC HWMON driver");
 MODULE_AUTHOR("Lars-Peter Clausen <[email protected]>");
drivers/hwmon/ntc_thermistor.c +1 -13
index eab1161..9b382ec 100644
@@ -432,19 +432,7 @@ static struct platform_driver ntc_thermistor_driver = {
 	.id_table = ntc_thermistor_id,
 };
 
-static int __init ntc_thermistor_init(void)
-{
-	return platform_driver_register(&ntc_thermistor_driver);
-}
-
-module_init(ntc_thermistor_init);
-
-static void __exit ntc_thermistor_cleanup(void)
-{
-	platform_driver_unregister(&ntc_thermistor_driver);
-}
-
-module_exit(ntc_thermistor_cleanup);
+module_platform_driver(ntc_thermistor_driver);
 
 MODULE_DESCRIPTION("NTC Thermistor Driver");
 MODULE_AUTHOR("MyungJoo Ham <[email protected]>");
drivers/hwmon/s3c-hwmon.c +1 -12
index b39f52e..f6c26d1 100644
@@ -393,18 +393,7 @@ static struct platform_driver s3c_hwmon_driver = {
 	.remove		= __devexit_p(s3c_hwmon_remove),
 };
 
-static int __init s3c_hwmon_init(void)
-{
-	return platform_driver_register(&s3c_hwmon_driver);
-}
-
-static void __exit s3c_hwmon_exit(void)
-{
-	platform_driver_unregister(&s3c_hwmon_driver);
-}
-
-module_init(s3c_hwmon_init);
-module_exit(s3c_hwmon_exit);
+module_platform_driver(s3c_hwmon_driver);
 
 MODULE_AUTHOR("Ben Dooks <[email protected]>");
 MODULE_DESCRIPTION("S3C ADC HWMon driver");
drivers/hwmon/sch5627.c +1 -12
index e3b5c60..79b6dab 100644
@@ -590,19 +590,8 @@ static struct platform_driver sch5627_driver = {
 	.remove		= sch5627_remove,
 };
 
-static int __init sch5627_init(void)
-{
-	return platform_driver_register(&sch5627_driver);
-}
-
-static void __exit sch5627_exit(void)
-{
-	platform_driver_unregister(&sch5627_driver);
-}
+module_platform_driver(sch5627_driver);
 
 MODULE_DESCRIPTION("SMSC SCH5627 Hardware Monitoring Driver");
 MODULE_AUTHOR("Hans de Goede <[email protected]>");
 MODULE_LICENSE("GPL");
-
-module_init(sch5627_init);
-module_exit(sch5627_exit);
drivers/hwmon/sch5636.c +1 -12
index 244407a..9d5236f 100644
@@ -521,19 +521,8 @@ static struct platform_driver sch5636_driver = {
 	.remove		= sch5636_remove,
 };
 
-static int __init sch5636_init(void)
-{
-	return platform_driver_register(&sch5636_driver);
-}
-
-static void __exit sch5636_exit(void)
-{
-	platform_driver_unregister(&sch5636_driver);
-}
+module_platform_driver(sch5636_driver);
 
 MODULE_DESCRIPTION("SMSC SCH5636 Hardware Monitoring Driver");
 MODULE_AUTHOR("Hans de Goede <[email protected]>");
 MODULE_LICENSE("GPL");
-
-module_init(sch5636_init);
-module_exit(sch5636_exit);
drivers/hwmon/twl4030-madc-hwmon.c +1 -13
index 5724074..0018c7d 100644
@@ -136,19 +136,7 @@ static struct platform_driver twl4030_madc_hwmon_driver = {
 		   },
 };
 
-static int __init twl4030_madc_hwmon_init(void)
-{
-	return platform_driver_register(&twl4030_madc_hwmon_driver);
-}
-
-module_init(twl4030_madc_hwmon_init);
-
-static void __exit twl4030_madc_hwmon_exit(void)
-{
-	platform_driver_unregister(&twl4030_madc_hwmon_driver);
-}
-
-module_exit(twl4030_madc_hwmon_exit);
+module_platform_driver(twl4030_madc_hwmon_driver);
 
 MODULE_DESCRIPTION("TWL4030 ADC Hwmon driver");
 MODULE_LICENSE("GPL");
drivers/hwmon/ultra45_env.c +1 -12
index 3cd07bf..b9a87e8 100644
@@ -309,15 +309,4 @@ static struct platform_driver env_driver = {
 	.remove		= __devexit_p(env_remove),
 };
 
-static int __init env_init(void)
-{
-	return platform_driver_register(&env_driver);
-}
-
-static void __exit env_exit(void)
-{
-	platform_driver_unregister(&env_driver);
-}
-
-module_init(env_init);
-module_exit(env_exit);
+module_platform_driver(env_driver);
drivers/hwmon/wm831x-hwmon.c +1 -11
index 97b1f83..9b598ed 100644
@@ -209,17 +209,7 @@ static struct platform_driver wm831x_hwmon_driver = {
 	},
 };
 
-static int __init wm831x_hwmon_init(void)
-{
-	return platform_driver_register(&wm831x_hwmon_driver);
-}
-module_init(wm831x_hwmon_init);
-
-static void __exit wm831x_hwmon_exit(void)
-{
-	platform_driver_unregister(&wm831x_hwmon_driver);
-}
-module_exit(wm831x_hwmon_exit);
+module_platform_driver(wm831x_hwmon_driver);
 
 MODULE_AUTHOR("Mark Brown <[email protected]>");
 MODULE_DESCRIPTION("WM831x Hardware Monitoring");
drivers/hwmon/wm8350-hwmon.c +1 -11
index 1329059..3ff67ed 100644
@@ -133,17 +133,7 @@ static struct platform_driver wm8350_hwmon_driver = {
 	},
 };
 
-static int __init wm8350_hwmon_init(void)
-{
-	return platform_driver_register(&wm8350_hwmon_driver);
-}
-module_init(wm8350_hwmon_init);
-
-static void __exit wm8350_hwmon_exit(void)
-{
-	platform_driver_unregister(&wm8350_hwmon_driver);
-}
-module_exit(wm8350_hwmon_exit);
+module_platform_driver(wm8350_hwmon_driver);
 
 MODULE_AUTHOR("Mark Brown <[email protected]>");
 MODULE_DESCRIPTION("WM8350 Hardware Monitoring");
Signature · 9 lines
1.7.5.4




_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Applied
#2 lore raw
In reply to Axel Lin
Quoted 4 lines · Axel Lin

This patch converts the drivers in drivers/hwmon/* to use the module_platform_driver() macro which makes the code smaller and a bit simpler.

Quoted 10 lines
Cc Donggeun Kim <[email protected]>
Cc Simon Guinot <[email protected]>
Cc Lars-Peter Clausen <[email protected]>
Cc MyungJoo Ham <[email protected]>
Cc Ben Dooks <[email protected]>
Cc Hans de Goede <[email protected]>
Cc J Keerthy <[email protected]>
Cc David S. Miller <[email protected]>
Cc Mark Brown <[email protected]>
Signed-off-by Axel Lin <[email protected]>

Applied. I'll let it rest in linux-next for a couple of days and send it to Linus if there are no problems.

Guenter

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors