Skip to content

Commit

Permalink
Input: convert SPI drivers to use module_spi_driver()
Browse files Browse the repository at this point in the history
This patch converts the drivers in drivers/input/* to use the
module_spi_driver() macro which makes the code smaller and a bit
simpler.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Axel Lin authored and Dmitry Torokhov committed Mar 17, 2012
1 parent 0f1142a commit ca83922
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 77 deletions.
12 changes: 1 addition & 11 deletions drivers/input/misc/ad714x-spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <21cnbao@gmail.com>");
Expand Down
12 changes: 1 addition & 11 deletions drivers/input/misc/adxl34x-spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,17 +129,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 <hennerich@blackfin.uclinux.org>");
MODULE_DESCRIPTION("ADXL345/346 Three-Axis Digital Accelerometer SPI Bus Driver");
Expand Down
12 changes: 1 addition & 11 deletions drivers/input/touchscreen/ad7877.c
Original file line number Diff line number Diff line change
Expand Up @@ -860,17 +860,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 <hennerich@blackfin.uclinux.org>");
MODULE_DESCRIPTION("AD7877 touchscreen Driver");
Expand Down
12 changes: 1 addition & 11 deletions drivers/input/touchscreen/ad7879-spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -157,17 +157,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 <hennerich@blackfin.uclinux.org>");
MODULE_DESCRIPTION("AD7879(-1) touchscreen SPI bus driver");
Expand Down
12 changes: 1 addition & 11 deletions drivers/input/touchscreen/ads7846.c
Original file line number Diff line number Diff line change
Expand Up @@ -1433,17 +1433,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");
Expand Down
12 changes: 1 addition & 11 deletions drivers/input/touchscreen/cyttsp_spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,17 +191,7 @@ static struct spi_driver cyttsp_spi_driver = {
.remove = __devexit_p(cyttsp_spi_remove),
};

static int __init cyttsp_spi_init(void)
{
return spi_register_driver(&cyttsp_spi_driver);
}
module_init(cyttsp_spi_init);

static void __exit cyttsp_spi_exit(void)
{
spi_unregister_driver(&cyttsp_spi_driver);
}
module_exit(cyttsp_spi_exit);
module_spi_driver(cyttsp_spi_driver);

MODULE_ALIAS("spi:cyttsp");
MODULE_LICENSE("GPL");
Expand Down
12 changes: 1 addition & 11 deletions drivers/input/touchscreen/tsc2005.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <lauri.leukkunen@nokia.com>");
MODULE_DESCRIPTION("TSC2005 Touchscreen Driver");
Expand Down

0 comments on commit ca83922

Please sign in to comment.