From 263f79369ae24d718d24c65134a3c303124fe1a8 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Fri, 16 Mar 2012 23:05:44 -0700
Subject: [PATCH] --- yaml --- r: 294039 b: refs/heads/master c:
 4a53383565e340254479ce4d47bc181884ddf6c3 h: refs/heads/master i:   294037:
 ba27a85c7ae8e0f5d9696f79700d7d6bcc7e5cb8   294035:
 fb89db7d1827deeb9d6a332bfbb547a707c9cf4b   294031:
 9308c4299c2cfa177914e3c862a13d527cccbfa0 v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/input/misc/gp2ap002a00f.c         | 13 +------------
 trunk/drivers/input/mouse/synaptics_usb.c       | 13 +------------
 trunk/drivers/input/touchscreen/auo-pixcir-ts.c | 12 +-----------
 trunk/drivers/input/touchscreen/cyttsp_i2c.c    | 12 +-----------
 trunk/drivers/input/touchscreen/pixcir_i2c_ts.c | 12 +-----------
 6 files changed, 6 insertions(+), 58 deletions(-)

diff --git a/[refs] b/[refs]
index 7f06f99ec333..6a23b7cd662a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b92c1cf6b638e7cbe9fdaac3f6efb8874f5cc02
+refs/heads/master: 4a53383565e340254479ce4d47bc181884ddf6c3
diff --git a/trunk/drivers/input/misc/gp2ap002a00f.c b/trunk/drivers/input/misc/gp2ap002a00f.c
index 71fba8c2fc66..b6664cfa340a 100644
--- a/trunk/drivers/input/misc/gp2ap002a00f.c
+++ b/trunk/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/trunk/drivers/input/mouse/synaptics_usb.c b/trunk/drivers/input/mouse/synaptics_usb.c
index e559a947bb57..3c5eaaa5d154 100644
--- a/trunk/drivers/input/mouse/synaptics_usb.c
+++ b/trunk/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/trunk/drivers/input/touchscreen/auo-pixcir-ts.c b/trunk/drivers/input/touchscreen/auo-pixcir-ts.c
index 94fb9fbb08a9..c7047b6bb020 100644
--- a/trunk/drivers/input/touchscreen/auo-pixcir-ts.c
+++ b/trunk/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/trunk/drivers/input/touchscreen/cyttsp_i2c.c b/trunk/drivers/input/touchscreen/cyttsp_i2c.c
index c7110cc06b9d..2af1d0c52bcd 100644
--- a/trunk/drivers/input/touchscreen/cyttsp_i2c.c
+++ b/trunk/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/trunk/drivers/input/touchscreen/pixcir_i2c_ts.c b/trunk/drivers/input/touchscreen/pixcir_i2c_ts.c
index d5ac09a1ee56..72f6ba3a4709 100644
--- a/trunk/drivers/input/touchscreen/pixcir_i2c_ts.c
+++ b/trunk/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");