summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/eeprom/at24.c2
-rw-r--r--drivers/input/qt1070.c2
-rw-r--r--drivers/mfd/lp3972.c2
-rw-r--r--drivers/mfd/mc13xxx.c2
-rw-r--r--drivers/mfd/mc34704.c2
-rw-r--r--drivers/mfd/mc34708.c2
-rw-r--r--drivers/mfd/mc9sdz60.c2
-rw-r--r--drivers/mfd/stmpe-i2c.c2
-rw-r--r--drivers/mfd/twl4030.c2
-rw-r--r--drivers/mfd/twl6030.c2
-rw-r--r--include/i2c/i2c.h2
11 files changed, 11 insertions, 11 deletions
diff --git a/drivers/eeprom/at24.c b/drivers/eeprom/at24.c
index 6f0133acdb..4b2afc4775 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 ebe2b81f57..43ea8823be 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 082ecaa54b..ee794df2d8 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 359b118f54..91c874fcac 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 276b723b1b..9afab07a2d 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 fbd68913c8..63db1e1fe5 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 76c62e331e..0d2c56b480 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 9e4bbcccf1..d87620e8ff 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 93097659c6..3b4c661a87 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 6b872abe95..0645d3c4db 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 dc5e5fc99b..7b59a5102d 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);