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

PATCH Applied Axel Lin 2 participants 2 messages Jan 20, 2012 Hardware monitoring

Share & tools

Axel Lin

author

2012-01-20 07:53 UTC #0 lore raw

PATCH 2/2 hwmon: convert drivers/hwmon/* to use module_spi_driver()

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

Signed-off-by Axel Lin <[email protected]>

Cc Sonic Zhang <[email protected]>

Cc Marc Pignat <[email protected]>

Cc Paul Thomas <[email protected]>

Cc Eric Miao <[email protected]>

Acked-by Sonic Zhang <[email protected]>

---
 drivers/hwmon/ad7314.c  |   12 +-----------
 drivers/hwmon/adcxx.c   |   13 +------------
 drivers/hwmon/ads7871.c |   13 +------------
 drivers/hwmon/lm70.c    |   13 +------------
 drivers/hwmon/max1111.c |   12 +-----------
 5 files changed, 5 insertions(+), 58 deletions(-)

drivers/hwmon/ad7314.c +1 ~~-11~~

index 5d760f3..0e0cfcc 100644
@@ -167,17 +167,7 @@ static struct spi_driver ad7314_driver = {
 	.id_table = ad7314_id,
 };
 
-static __init int ad7314_init(void)
-{
-	return spi_register_driver(&ad7314_driver);
-}
-module_init(ad7314_init);
-
-static __exit void ad7314_exit(void)
-{
-	spi_unregister_driver(&ad7314_driver);
-}
-module_exit(ad7314_exit);
+module_spi_driver(ad7314_driver);
 
 MODULE_AUTHOR("Sonic Zhang <[email protected]>");
 MODULE_DESCRIPTION("Analog Devices AD7314, ADT7301 and ADT7302 digital"

drivers/hwmon/adcxx.c +1 ~~-12~~

index ceb24a3..a3d3183 100644
@@ -248,18 +248,7 @@ static struct spi_driver adcxx_driver = {
 	.remove	= __devexit_p(adcxx_remove),
 };
 
-static int __init init_adcxx(void)
-{
-	return spi_register_driver(&adcxx_driver);
-}
-
-static void __exit exit_adcxx(void)
-{
-	spi_unregister_driver(&adcxx_driver);
-}
-
-module_init(init_adcxx);
-module_exit(exit_adcxx);
+module_spi_driver(adcxx_driver);
 
 MODULE_AUTHOR("Marc Pignat");
 MODULE_DESCRIPTION("National Semiconductor adcxx8sxxx Linux driver");

drivers/hwmon/ads7871.c +1 ~~-12~~

index 04450f8..11a5f5f 100644
@@ -234,18 +234,7 @@ static struct spi_driver ads7871_driver = {
 	.remove = __devexit_p(ads7871_remove),
 };
 
-static int __init ads7871_init(void)
-{
-	return spi_register_driver(&ads7871_driver);
-}
-
-static void __exit ads7871_exit(void)
-{
-	spi_unregister_driver(&ads7871_driver);
-}
-
-module_init(ads7871_init);
-module_exit(ads7871_exit);
+module_spi_driver(ads7871_driver);
 
 MODULE_AUTHOR("Paul Thomas <[email protected]>");
 MODULE_DESCRIPTION("TI ADS7871 A/D driver");

drivers/hwmon/lm70.c +1 ~~-12~~

index 0994cb0..9c12ef3 100644
@@ -213,18 +213,7 @@ static struct spi_driver lm70_driver = {
 	.remove	= __devexit_p(lm70_remove),
 };
 
-static int __init init_lm70(void)
-{
-	return spi_register_driver(&lm70_driver);
-}
-
-static void __exit cleanup_lm70(void)
-{
-	spi_unregister_driver(&lm70_driver);
-}
-
-module_init(init_lm70);
-module_exit(cleanup_lm70);
+module_spi_driver(lm70_driver);
 
 MODULE_AUTHOR("Kaiwan N Billimoria");
 MODULE_DESCRIPTION("NS LM70 / TI TMP121/TMP123 Linux driver");

drivers/hwmon/max1111.c +1 ~~-11~~

index 482ca90..e5206ae 100644
@@ -227,17 +227,7 @@ static struct spi_driver max1111_driver = {
 	.remove		= __devexit_p(max1111_remove),
 };
 
-static int __init max1111_init(void)
-{
-	return spi_register_driver(&max1111_driver);
-}
-module_init(max1111_init);
-
-static void __exit max1111_exit(void)
-{
-	spi_unregister_driver(&max1111_driver);
-}
-module_exit(max1111_exit);
+module_spi_driver(max1111_driver);
 
 MODULE_AUTHOR("Eric Miao <[email protected]>");
 MODULE_DESCRIPTION("MAX1111 ADC Driver");

Signature · 9 lines

1.7.5.4




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

Guenter Roeck

Applied

2012-01-20 09:57 UTC #1 lore raw

Quoted 9 lines · Axel Lin

This patch converts the drivers in drivers/hwmon/* to use the module_spi_driver() macro which makes the code smaller and a bit simpler.
Signed-off-by Axel Lin <[email protected]>
Cc Sonic Zhang <[email protected]>
Cc Marc Pignat <[email protected]>
Cc Paul Thomas <[email protected]>
Cc Eric Miao <[email protected]>
Acked-by Sonic Zhang <[email protected]>

Quoted 8 lines

---
 drivers/hwmon/ad7314.c  |   12 +-----------
 drivers/hwmon/adcxx.c   |   13 +------------
 drivers/hwmon/ads7871.c |   13 +------------
 drivers/hwmon/lm70.c    |   13 +------------
 drivers/hwmon/max1111.c |   12 +-----------
 5 files changed, 5 insertions(+), 58 deletions(-)

Applied.

Thanks,
Guenter

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