Skip to contentSkip to conversation

Input: convert drivers/input/* to use module_spi_driver()

PATCH New Axel Lin 1 participant 1 message Nov 25, 2011

Subsystems (3)
HID Input drivers AD7877 touchscreen driver
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 Input: convert drivers/input/* to use module_spi_driver()

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

Cc Barry Song <[email protected]>
Cc Michael Hennerich <[email protected]>
Cc Anatolij Gustschin <[email protected]>
Cc Lauri Leukkunen <[email protected]>
Signed-off-by Axel Lin <[email protected]>
---
 drivers/input/misc/ad714x-spi.c        |   12 +-----------
 drivers/input/misc/adxl34x-spi.c       |   12 +-----------
 drivers/input/touchscreen/ad7877.c     |   12 +-----------
 drivers/input/touchscreen/ad7879-spi.c |   12 +-----------
 drivers/input/touchscreen/ads7846.c    |   12 +-----------
 drivers/input/touchscreen/tsc2005.c    |   12 +-----------
 6 files changed, 6 insertions(+), 66 deletions(-)
drivers/input/misc/ad714x-spi.c +1 -11
index 875b508..75f6136d 100644
@@ -123,17 +123,7 @@ static struct spi_driver ad714x_spi_driver = {
 	.remove		= __devexit_p(ad714x_spi_remove),
 };
 
-static __init int ad714x_spi_init(void)
-{
-	return spi_register_driver(&ad714x_spi_driver);
-}
-module_init(ad714x_spi_init);
-
-static __exit void ad714x_spi_exit(void)
-{
-	spi_unregister_driver(&ad714x_spi_driver);
-}
-module_exit(ad714x_spi_exit);
+module_spi_driver(ad714x_spi_driver);
 
 MODULE_DESCRIPTION("Analog Devices AD714X Capacitance Touch Sensor SPI Bus Driver");
 MODULE_AUTHOR("Barry Song <[email protected]>");
drivers/input/misc/adxl34x-spi.c +1 -11
index f29de22..69bc4c0 100644
@@ -130,17 +130,7 @@ static struct spi_driver adxl34x_driver = {
 	.remove  = __devexit_p(adxl34x_spi_remove),
 };
 
-static int __init adxl34x_spi_init(void)
-{
-	return spi_register_driver(&adxl34x_driver);
-}
-module_init(adxl34x_spi_init);
-
-static void __exit adxl34x_spi_exit(void)
-{
-	spi_unregister_driver(&adxl34x_driver);
-}
-module_exit(adxl34x_spi_exit);
+module_spi_driver(adxl34x_driver);
 
 MODULE_AUTHOR("Michael Hennerich <[email protected]>");
 MODULE_DESCRIPTION("ADXL345/346 Three-Axis Digital Accelerometer SPI Bus Driver");
drivers/input/touchscreen/ad7877.c +1 -11
index 2da9f18..7a3fd9b 100644
@@ -861,17 +861,7 @@ static struct spi_driver ad7877_driver = {
 	.remove		= __devexit_p(ad7877_remove),
 };
 
-static int __init ad7877_init(void)
-{
-	return spi_register_driver(&ad7877_driver);
-}
-module_init(ad7877_init);
-
-static void __exit ad7877_exit(void)
-{
-	spi_unregister_driver(&ad7877_driver);
-}
-module_exit(ad7877_exit);
+module_spi_driver(ad7877_driver);
 
 MODULE_AUTHOR("Michael Hennerich <[email protected]>");
 MODULE_DESCRIPTION("AD7877 touchscreen Driver");
drivers/input/touchscreen/ad7879-spi.c +1 -11
index 8f391ff..3a029f9 100644
@@ -158,17 +158,7 @@ static struct spi_driver ad7879_spi_driver = {
 	.remove		= __devexit_p(ad7879_spi_remove),
 };
 
-static int __init ad7879_spi_init(void)
-{
-	return spi_register_driver(&ad7879_spi_driver);
-}
-module_init(ad7879_spi_init);
-
-static void __exit ad7879_spi_exit(void)
-{
-	spi_unregister_driver(&ad7879_spi_driver);
-}
-module_exit(ad7879_spi_exit);
+module_spi_driver(ad7879_spi_driver);
 
 MODULE_AUTHOR("Michael Hennerich <[email protected]>");
 MODULE_DESCRIPTION("AD7879(-1) touchscreen SPI bus driver");
drivers/input/touchscreen/ads7846.c +1 -11
index 4cedae6..a155e0d 100644
@@ -1434,17 +1434,7 @@ static struct spi_driver ads7846_driver = {
 	.remove		= __devexit_p(ads7846_remove),
 };
 
-static int __init ads7846_init(void)
-{
-	return spi_register_driver(&ads7846_driver);
-}
-module_init(ads7846_init);
-
-static void __exit ads7846_exit(void)
-{
-	spi_unregister_driver(&ads7846_driver);
-}
-module_exit(ads7846_exit);
+module_spi_driver(ads7846_driver);
 
 MODULE_DESCRIPTION("ADS7846 TouchScreen Driver");
 MODULE_LICENSE("GPL");
drivers/input/touchscreen/tsc2005.c +1 -11
index cbf0ff3..a7dc23a 100644
@@ -747,17 +747,7 @@ static struct spi_driver tsc2005_driver = {
 	.remove	= __devexit_p(tsc2005_remove),
 };
 
-static int __init tsc2005_init(void)
-{
-	return spi_register_driver(&tsc2005_driver);
-}
-module_init(tsc2005_init);
-
-static void __exit tsc2005_exit(void)
-{
-	spi_unregister_driver(&tsc2005_driver);
-}
-module_exit(tsc2005_exit);
+module_spi_driver(tsc2005_driver);
 
 MODULE_AUTHOR("Lauri Leukkunen <[email protected]>");
 MODULE_DESCRIPTION("TSC2005 Touchscreen Driver");
Signature · 1 line
1.7.5.4