1 files changed, 7 insertions, 18 deletions

diff --git a/arch/arm/mach-pnx4008/i2c.c b/arch/arm/mach-pnx4008/i2c.c
index 23ec335a4bc0..33146e832dd7 100644
--- a/arch/arm/mach-pnx4008/i2c.c
+++ b/arch/arm/mach-pnx4008/i2c.c
@@ -18,45 +18,34 @@
 #include <mach/irqs.h>
 #include <mach/i2c.h>
 
-static struct i2c_pnx_algo_data pnx_algo_data0 = {
-        .base = PNX4008_I2C1_BASE,
-        .irq = I2C_1_INT,
-};
-
-static struct i2c_pnx_algo_data pnx_algo_data1 = {
-        .base = PNX4008_I2C2_BASE,
-        .irq = I2C_2_INT,
-};
-
-static struct i2c_pnx_algo_data pnx_algo_data2 = {
-        .base = (PNX4008_USB_CONFIG_BASE + 0x300),
-        .irq = USB_I2C_INT,
-};
-
 static struct i2c_adapter pnx_adapter0 = {
         .name = I2C_CHIP_NAME "0",
-        .algo_data = &pnx_algo_data0,
 };
+
 static struct i2c_adapter pnx_adapter1 = {
         .name = I2C_CHIP_NAME "1",
-        .algo_data = &pnx_algo_data1,
 };
 
 static struct i2c_adapter pnx_adapter2 = {
         .name = "USB-I2C",
-        .algo_data = &pnx_algo_data2,
 };
 
 static struct i2c_pnx_data i2c0_data = {
         .adapter = &pnx_adapter0,
+        .base = PNX4008_I2C1_BASE,
+        .irq = I2C_1_INT,
 };
 
 static struct i2c_pnx_data i2c1_data = {
         .adapter = &pnx_adapter1,
+        .base = PNX4008_I2C2_BASE,
+        .irq = I2C_2_INT,
 };
 
 static struct i2c_pnx_data i2c2_data = {
         .adapter = &pnx_adapter2,
+        .base = (PNX4008_USB_CONFIG_BASE + 0x300),
+        .irq = USB_I2C_INT,
 };
 
 static struct platform_device i2c0_device = {