aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-ixp2000.c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2005-10-07 17:04:48 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-10-28 17:02:08 -0400
commit8a1b028bca95b5af36e94a660c4d284fe3313f74 (patch)
tree8fc0193e66117776b4112cb9484e61a51bf48a21 /drivers/i2c/busses/i2c-ixp2000.c
parentca68f1193e8fc86470d4222d563d13b5584dc4f8 (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/busses/i2c-ixp2000.c')
-rw-r--r--drivers/i2c/busses/i2c-ixp2000.c4
1 files changed, 4 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
39static struct device_driver ixp2000_i2c_driver;
40
39static inline int ixp2000_scl_pin(void *data) 41static 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;