diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-21 12:25:27 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-12 17:32:41 +0000 |
| commit | 9d7f73632c87ef1b6187eb539d1efd63c3cf0e36 (patch) | |
| tree | d4eda1040089f76fa092dc96432d708064a84ad5 /arch/arm/mach-pnx4008 | |
| parent | 44c5d739181886cff8e3903dfa38cd704f3d9640 (diff) | |
| download | talos-op-linux-9d7f73632c87ef1b6187eb539d1efd63c3cf0e36.tar.gz talos-op-linux-9d7f73632c87ef1b6187eb539d1efd63c3cf0e36.zip | |
ARM: PNX4008: move i2c_adapter structure inside the drivers private data
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pnx4008')
| -rw-r--r-- | arch/arm/mach-pnx4008/i2c.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/arch/arm/mach-pnx4008/i2c.c b/arch/arm/mach-pnx4008/i2c.c index 33146e832dd7..8103f9644e2d 100644 --- a/arch/arm/mach-pnx4008/i2c.c +++ b/arch/arm/mach-pnx4008/i2c.c @@ -18,32 +18,20 @@ #include <mach/irqs.h> #include <mach/i2c.h> -static struct i2c_adapter pnx_adapter0 = { - .name = I2C_CHIP_NAME "0", -}; - -static struct i2c_adapter pnx_adapter1 = { - .name = I2C_CHIP_NAME "1", -}; - -static struct i2c_adapter pnx_adapter2 = { - .name = "USB-I2C", -}; - static struct i2c_pnx_data i2c0_data = { - .adapter = &pnx_adapter0, + .name = I2C_CHIP_NAME "0", .base = PNX4008_I2C1_BASE, .irq = I2C_1_INT, }; static struct i2c_pnx_data i2c1_data = { - .adapter = &pnx_adapter1, + .name = I2C_CHIP_NAME "1", .base = PNX4008_I2C2_BASE, .irq = I2C_2_INT, }; static struct i2c_pnx_data i2c2_data = { - .adapter = &pnx_adapter2, + .name = "USB-I2C", .base = (PNX4008_USB_CONFIG_BASE + 0x300), .irq = USB_I2C_INT, }; |
