diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-10-07 17:04:48 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 17:02:08 -0400 |
commit | 8a1b028bca95b5af36e94a660c4d284fe3313f74 (patch) | |
tree | 8fc0193e66117776b4112cb9484e61a51bf48a21 /drivers/i2c | |
parent | ca68f1193e8fc86470d4222d563d13b5584dc4f8 (diff) |
[PATCH] i2c: Add missing i2c-ixp2000/4xx adapter name
The ixp4xx and ixp2000 i2c bus drivers omit to fill the required
i2c_adapter name field. Copy the device driver name field there.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/i2c-ixp2000.c | 4 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-ixp4xx.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-ixp2000.c b/drivers/i2c/busses/i2c-ixp2000.c index 1956af382cd8..9dee505ceed2 100644 --- a/drivers/i2c/busses/i2c-ixp2000.c +++ b/drivers/i2c/busses/i2c-ixp2000.c | |||
@@ -36,6 +36,8 @@ | |||
36 | #include <asm/hardware.h> /* Pick up IXP2000-specific bits */ | 36 | #include <asm/hardware.h> /* Pick up IXP2000-specific bits */ |
37 | #include <asm/arch/gpio.h> | 37 | #include <asm/arch/gpio.h> |
38 | 38 | ||
39 | static struct device_driver ixp2000_i2c_driver; | ||
40 | |||
39 | static inline int ixp2000_scl_pin(void *data) | 41 | static inline int ixp2000_scl_pin(void *data) |
40 | { | 42 | { |
41 | return ((struct ixp2000_i2c_pins*)data)->scl_pin; | 43 | return ((struct ixp2000_i2c_pins*)data)->scl_pin; |
@@ -121,6 +123,8 @@ static int ixp2000_i2c_probe(struct device *dev) | |||
121 | drv_data->algo_data.timeout = 100; | 123 | drv_data->algo_data.timeout = 100; |
122 | 124 | ||
123 | drv_data->adapter.id = I2C_HW_B_IXP2000, | 125 | drv_data->adapter.id = I2C_HW_B_IXP2000, |
126 | strlcpy(drv_data->adapter.name, ixp2000_i2c_driver.name, | ||
127 | I2C_NAME_SIZE); | ||
124 | drv_data->adapter.algo_data = &drv_data->algo_data, | 128 | drv_data->adapter.algo_data = &drv_data->algo_data, |
125 | 129 | ||
126 | drv_data->adapter.dev.parent = &plat_dev->dev; | 130 | drv_data->adapter.dev.parent = &plat_dev->dev; |
diff --git a/drivers/i2c/busses/i2c-ixp4xx.c b/drivers/i2c/busses/i2c-ixp4xx.c index f6f5ca31fdba..013981df38af 100644 --- a/drivers/i2c/busses/i2c-ixp4xx.c +++ b/drivers/i2c/busses/i2c-ixp4xx.c | |||
@@ -35,6 +35,8 @@ | |||
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; | ||
39 | |||
38 | static inline int ixp4xx_scl_pin(void *data) | 40 | static inline int ixp4xx_scl_pin(void *data) |
39 | { | 41 | { |
40 | return ((struct ixp4xx_i2c_pins*)data)->scl_pin; | 42 | return ((struct ixp4xx_i2c_pins*)data)->scl_pin; |
@@ -129,6 +131,8 @@ static int ixp4xx_i2c_probe(struct device *dev) | |||
129 | drv_data->algo_data.timeout = 100; | 131 | drv_data->algo_data.timeout = 100; |
130 | 132 | ||
131 | drv_data->adapter.id = I2C_HW_B_IXP4XX; | 133 | drv_data->adapter.id = I2C_HW_B_IXP4XX; |
134 | strlcpy(drv_data->adapter.name, ixp4xx_i2c_driver.name, | ||
135 | I2C_NAME_SIZE); | ||
132 | drv_data->adapter.algo_data = &drv_data->algo_data; | 136 | drv_data->adapter.algo_data = &drv_data->algo_data; |
133 | 137 | ||
134 | drv_data->adapter.dev.parent = &plat_dev->dev; | 138 | drv_data->adapter.dev.parent = &plat_dev->dev; |