Input: synaptics_usb - switch to module_usb_driver()

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

diff --git a/drivers/input/misc/gp2ap002a00f.c b/drivers/input/misc/gp2ap002a00f.c
index 71fba8c2fc6619676fe7713cf8a0f43d98732c78..b6664cfa340a8c731837990afc77bffe3a04c9ef 100644 (file)
--- a/drivers/input/misc/gp2ap002a00f.c
+++ b/drivers/input/misc/gp2ap002a00f.c
@@ -281,18 +281,7 @@ static struct i2c_driver gp2a_i2c_driver = {
        .id_table       = gp2a_i2c_id,
 };
 
-static int __init gp2a_init(void)
-{
-       return i2c_add_driver(&gp2a_i2c_driver);
-}
-
-static void __exit gp2a_exit(void)
-{
-       i2c_del_driver(&gp2a_i2c_driver);
-}
-
-module_init(gp2a_init);
-module_exit(gp2a_exit);
+module_i2c_driver(gp2a_i2c_driver);
 
 MODULE_AUTHOR("Courtney Cavin <courtney.cavin@sonyericsson.com>");
 MODULE_DESCRIPTION("Sharp GP2AP002A00F I2C Proximity/Opto sensor driver");

diff --git a/drivers/input/mouse/synaptics_usb.c b/drivers/input/mouse/synaptics_usb.c
index e559a947bb57cce2e0bc05a24c9bbb135fcb0f85..3c5eaaa5d154a115813e7d013195ac971ebaf59b 100644 (file)
--- a/drivers/input/mouse/synaptics_usb.c
+++ b/drivers/input/mouse/synaptics_usb.c
@@ -548,18 +548,7 @@ static struct usb_driver synusb_driver = {
        .supports_autosuspend = 1,
 };
 
-static int __init synusb_init(void)
-{
-       return usb_register(&synusb_driver);
-}
-
-static void __exit synusb_exit(void)
-{
-       usb_deregister(&synusb_driver);
-}
-
-module_init(synusb_init);
-module_exit(synusb_exit);
+module_usb_driver(synusb_driver);
 
 MODULE_AUTHOR("Rob Miller <rob@inpharmatica.co.uk>, "
               "Ron Lee <ron@debian.org>, "

diff --git a/drivers/input/touchscreen/auo-pixcir-ts.c b/drivers/input/touchscreen/auo-pixcir-ts.c
index 94fb9fbb08a993a074044ba8d3bbd0ccff2db925..c7047b6bb02027870fd652f0d57a7cc496ed1603 100644 (file)
--- a/drivers/input/touchscreen/auo-pixcir-ts.c
+++ b/drivers/input/touchscreen/auo-pixcir-ts.c
@@ -635,17 +635,7 @@ static struct i2c_driver auo_pixcir_driver = {
        .id_table       = auo_pixcir_idtable,
 };
 
-static int __init auo_pixcir_init(void)
-{
-       return i2c_add_driver(&auo_pixcir_driver);
-}
-module_init(auo_pixcir_init);
-
-static void __exit auo_pixcir_exit(void)
-{
-       i2c_del_driver(&auo_pixcir_driver);
-}
-module_exit(auo_pixcir_exit);
+module_i2c_driver(auo_pixcir_driver);
 
 MODULE_DESCRIPTION("AUO-PIXCIR touchscreen driver");
 MODULE_LICENSE("GPL v2");

diff --git a/drivers/input/touchscreen/cyttsp_i2c.c b/drivers/input/touchscreen/cyttsp_i2c.c
index c7110cc06b9dada5c651feaeb43f6ff0379c2d3e..2af1d0c52bcdda6d4960c941099c2eac1c05e85e 100644 (file)
--- a/drivers/input/touchscreen/cyttsp_i2c.c
+++ b/drivers/input/touchscreen/cyttsp_i2c.c
@@ -128,17 +128,7 @@ static struct i2c_driver cyttsp_i2c_driver = {
        .id_table       = cyttsp_i2c_id,
 };
 
-static int __init cyttsp_i2c_init(void)
-{
-       return i2c_add_driver(&cyttsp_i2c_driver);
-}
-module_init(cyttsp_i2c_init);
-
-static void __exit cyttsp_i2c_exit(void)
-{
-       return i2c_del_driver(&cyttsp_i2c_driver);
-}
-module_exit(cyttsp_i2c_exit);
+module_i2c_driver(cyttsp_i2c_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Cypress TrueTouch(R) Standard Product (TTSP) I2C driver");

diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c
index d5ac09a1ee56de7eb604b1951d28452dd1d850e7..72f6ba3a470937d2528207d20c53d182a0b7803f 100644 (file)
--- a/drivers/input/touchscreen/pixcir_i2c_ts.c
+++ b/drivers/input/touchscreen/pixcir_i2c_ts.c
@@ -222,17 +222,7 @@ static struct i2c_driver pixcir_i2c_ts_driver = {
        .id_table       = pixcir_i2c_ts_id,
 };
 
-static int __init pixcir_i2c_ts_init(void)
-{
-       return i2c_add_driver(&pixcir_i2c_ts_driver);
-}
-module_init(pixcir_i2c_ts_init);
-
-static void __exit pixcir_i2c_ts_exit(void)
-{
-       i2c_del_driver(&pixcir_i2c_ts_driver);
-}
-module_exit(pixcir_i2c_ts_exit);
+module_i2c_driver(pixcir_i2c_ts_driver);
 
 MODULE_AUTHOR("Jianchun Bian <jcbian@pixcir.com.cn>, Dequan Meng <dqmeng@pixcir.com.cn>");
 MODULE_DESCRIPTION("Pixcir I2C Touchscreen Driver");