diff options
author | Deepak Saxena <dsaxena@plexity.net> | 2005-11-17 14:09:53 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 14:23:48 -0500 |
commit | 1a7ec1a6a1df63aab9a1fa6174bd704241329805 (patch) | |
tree | 3e0048b905f1f118559b08f3c909582db8b6cad1 | |
parent | 7652aab77fbf6de8bcc69ee6a864270b0da6b3f6 (diff) |
[PATCH] Fix IXP4xx I2C driver build breakage
Platform device conversion missed a couple of spots.
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/i2c/busses/i2c-ixp4xx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-ixp4xx.c b/drivers/i2c/busses/i2c-ixp4xx.c index aa36855fa995..f87220be3c87 100644 --- a/drivers/i2c/busses/i2c-ixp4xx.c +++ b/drivers/i2c/busses/i2c-ixp4xx.c | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | #include <asm/hardware.h> /* Pick up IXP4xx-specific bits */ | 36 | #include <asm/hardware.h> /* Pick up IXP4xx-specific bits */ |
37 | 37 | ||
38 | static struct device_driver ixp4xx_i2c_driver; | 38 | static struct platform_driver ixp4xx_i2c_driver; |
39 | 39 | ||
40 | static inline int ixp4xx_scl_pin(void *data) | 40 | static inline int ixp4xx_scl_pin(void *data) |
41 | { | 41 | { |
@@ -128,7 +128,7 @@ static int ixp4xx_i2c_probe(struct platform_device *plat_dev) | |||
128 | drv_data->algo_data.timeout = 100; | 128 | drv_data->algo_data.timeout = 100; |
129 | 129 | ||
130 | drv_data->adapter.id = I2C_HW_B_IXP4XX; | 130 | drv_data->adapter.id = I2C_HW_B_IXP4XX; |
131 | strlcpy(drv_data->adapter.name, ixp4xx_i2c_driver.name, | 131 | strlcpy(drv_data->adapter.name, ixp4xx_i2c_driver.driver.name, |
132 | I2C_NAME_SIZE); | 132 | I2C_NAME_SIZE); |
133 | drv_data->adapter.algo_data = &drv_data->algo_data; | 133 | drv_data->adapter.algo_data = &drv_data->algo_data; |
134 | 134 | ||
@@ -140,7 +140,8 @@ static int ixp4xx_i2c_probe(struct platform_device *plat_dev) | |||
140 | gpio_line_set(gpio->sda_pin, 0); | 140 | gpio_line_set(gpio->sda_pin, 0); |
141 | 141 | ||
142 | if ((err = i2c_bit_add_bus(&drv_data->adapter) != 0)) { | 142 | if ((err = i2c_bit_add_bus(&drv_data->adapter) != 0)) { |
143 | printk(KERN_ERR "ERROR: Could not install %s\n", dev->bus_id); | 143 | printk(KERN_ERR "ERROR: Could not install %s\n", |
144 | plat_dev->dev.bus_id); | ||
144 | 145 | ||
145 | kfree(drv_data); | 146 | kfree(drv_data); |
146 | return err; | 147 | return err; |