From 4f255f731824b46f7cf3bca8c9448bcd7cad9ae8 Mon Sep 17 00:00:00 2001
From: Alexander Shiyan <shc_work@mail.ru>
Date: Sun, 10 Mar 2013 10:41:34 +0400
Subject: [PATCH] I2C: Rename i2c_register_driver() for using with
 register_driver_macro()

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/eeprom/at24.c   | 2 +-
 drivers/input/qt1070.c  | 2 +-
 drivers/mfd/lp3972.c    | 2 +-
 drivers/mfd/mc13xxx.c   | 2 +-
 drivers/mfd/mc34704.c   | 2 +-
 drivers/mfd/mc34708.c   | 2 +-
 drivers/mfd/mc9sdz60.c  | 2 +-
 drivers/mfd/stmpe-i2c.c | 2 +-
 drivers/mfd/twl4030.c   | 2 +-
 drivers/mfd/twl6030.c   | 2 +-
 include/i2c/i2c.h       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/eeprom/at24.c b/drivers/eeprom/at24.c
index 6f0133acd..4b2afc477 100644
--- a/drivers/eeprom/at24.c
+++ b/drivers/eeprom/at24.c
@@ -454,7 +454,7 @@ static struct driver_d at24_driver = {
 
 static int at24_init(void)
 {
-	i2c_register_driver(&at24_driver);
+	i2c_driver_register(&at24_driver);
 	return 0;
 }
 device_initcall(at24_init);
diff --git a/drivers/input/qt1070.c b/drivers/input/qt1070.c
index ebe2b81f5..43ea8823b 100644
--- a/drivers/input/qt1070.c
+++ b/drivers/input/qt1070.c
@@ -291,7 +291,7 @@ static struct driver_d qt1070_driver = {
 
 static int qt1070_init(void)
 {
-	i2c_register_driver(&qt1070_driver);
+	i2c_driver_register(&qt1070_driver);
 	return 0;
 }
 device_initcall(qt1070_init);
diff --git a/drivers/mfd/lp3972.c b/drivers/mfd/lp3972.c
index 082ecaa54..ee794df2d 100644
--- a/drivers/mfd/lp3972.c
+++ b/drivers/mfd/lp3972.c
@@ -99,7 +99,7 @@ static struct driver_d lp_driver = {
 
 static int lp_init(void)
 {
-	i2c_register_driver(&lp_driver);
+	i2c_driver_register(&lp_driver);
 	return 0;
 }
 
diff --git a/drivers/mfd/mc13xxx.c b/drivers/mfd/mc13xxx.c
index 359b118f5..91c874fca 100644
--- a/drivers/mfd/mc13xxx.c
+++ b/drivers/mfd/mc13xxx.c
@@ -356,7 +356,7 @@ static struct driver_d mc_i2c_driver = {
 
 static int mc_i2c_init(void)
 {
-	return i2c_register_driver(&mc_i2c_driver);
+	return i2c_driver_register(&mc_i2c_driver);
 }
 device_initcall(mc_i2c_init);
 #endif
diff --git a/drivers/mfd/mc34704.c b/drivers/mfd/mc34704.c
index 276b723b1..9afab07a2 100644
--- a/drivers/mfd/mc34704.c
+++ b/drivers/mfd/mc34704.c
@@ -130,7 +130,7 @@ static struct driver_d mc34704_driver = {
 
 static int mc34704_init(void)
 {
-	i2c_register_driver(&mc34704_driver);
+	i2c_driver_register(&mc34704_driver);
 	return 0;
 }
 device_initcall(mc34704_init);
diff --git a/drivers/mfd/mc34708.c b/drivers/mfd/mc34708.c
index fbd68913c..63db1e1fe 100644
--- a/drivers/mfd/mc34708.c
+++ b/drivers/mfd/mc34708.c
@@ -275,7 +275,7 @@ static struct driver_d mc_i2c_driver = {
 
 static int mc_i2c_init(void)
 {
-	return i2c_register_driver(&mc_i2c_driver);
+	return i2c_driver_register(&mc_i2c_driver);
 }
 
 device_initcall(mc_i2c_init);
diff --git a/drivers/mfd/mc9sdz60.c b/drivers/mfd/mc9sdz60.c
index 76c62e331..0d2c56b48 100644
--- a/drivers/mfd/mc9sdz60.c
+++ b/drivers/mfd/mc9sdz60.c
@@ -142,7 +142,7 @@ static struct driver_d mc_driver = {
 
 static int mc_init(void)
 {
-        i2c_register_driver(&mc_driver);
+        i2c_driver_register(&mc_driver);
         return 0;
 }
 
diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c
index 9e4bbcccf..d87620e8f 100644
--- a/drivers/mfd/stmpe-i2c.c
+++ b/drivers/mfd/stmpe-i2c.c
@@ -147,7 +147,7 @@ static struct driver_d stmpe_driver = {
 
 static int stmpe_init(void)
 {
-        i2c_register_driver(&stmpe_driver);
+        i2c_driver_register(&stmpe_driver);
         return 0;
 }
 
diff --git a/drivers/mfd/twl4030.c b/drivers/mfd/twl4030.c
index 93097659c..3b4c661a8 100644
--- a/drivers/mfd/twl4030.c
+++ b/drivers/mfd/twl4030.c
@@ -53,7 +53,7 @@ static struct driver_d twl_driver = {
 
 static int twl_init(void)
 {
-	i2c_register_driver(&twl_driver);
+	i2c_driver_register(&twl_driver);
 	return 0;
 }
 
diff --git a/drivers/mfd/twl6030.c b/drivers/mfd/twl6030.c
index 6b872abe9..0645d3c4d 100644
--- a/drivers/mfd/twl6030.c
+++ b/drivers/mfd/twl6030.c
@@ -70,7 +70,7 @@ static struct driver_d twl_driver = {
 
 static int twl_init(void)
 {
-	i2c_register_driver(&twl_driver);
+	i2c_driver_register(&twl_driver);
 	return 0;
 }
 
diff --git a/include/i2c/i2c.h b/include/i2c/i2c.h
index dc5e5fc99..7b59a5102 100644
--- a/include/i2c/i2c.h
+++ b/include/i2c/i2c.h
@@ -151,7 +151,7 @@ extern int i2c_write_reg(struct i2c_client *client, u32 addr, const u8 *buf, u16
 
 extern struct bus_type i2c_bus;
 
-static inline int i2c_register_driver(struct driver_d *drv)
+static inline int i2c_driver_register(struct driver_d *drv)
 {
 	drv->bus = &i2c_bus;
 	return register_driver(drv);