]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] i2c: Add missing i2c-ixp2000/4xx adapter name
authorJean Delvare <khali@linux-fr.org>
Fri, 7 Oct 2005 21:04:48 +0000 (23:04 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 28 Oct 2005 21:02:08 +0000 (14:02 -0700)
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>
drivers/i2c/busses/i2c-ixp2000.c
drivers/i2c/busses/i2c-ixp4xx.c

index 1956af382cd896d8421db7373c2d7c395d30a8ad..9dee505ceed224bcceb36c66515c0cc8f974a396 100644 (file)
@@ -36,6 +36,8 @@
 #include <asm/hardware.h>      /* Pick up IXP2000-specific bits */
 #include <asm/arch/gpio.h>
 
+static struct device_driver ixp2000_i2c_driver;
+
 static inline int ixp2000_scl_pin(void *data)
 {
        return ((struct ixp2000_i2c_pins*)data)->scl_pin;
@@ -121,6 +123,8 @@ static int ixp2000_i2c_probe(struct device *dev)
        drv_data->algo_data.timeout = 100;
 
        drv_data->adapter.id = I2C_HW_B_IXP2000,
+       strlcpy(drv_data->adapter.name, ixp2000_i2c_driver.name,
+               I2C_NAME_SIZE);
        drv_data->adapter.algo_data = &drv_data->algo_data,
 
        drv_data->adapter.dev.parent = &plat_dev->dev;
index f6f5ca31fdba0955a1826d3c3781762a415e6619..013981df38af2e45eaf854d11e16944cd4143642 100644 (file)
@@ -35,6 +35,8 @@
 
 #include <asm/hardware.h>      /* Pick up IXP4xx-specific bits */
 
+static struct device_driver ixp4xx_i2c_driver;
+
 static inline int ixp4xx_scl_pin(void *data)
 {
        return ((struct ixp4xx_i2c_pins*)data)->scl_pin;
@@ -129,6 +131,8 @@ static int ixp4xx_i2c_probe(struct device *dev)
        drv_data->algo_data.timeout = 100;
 
        drv_data->adapter.id = I2C_HW_B_IXP4XX;
+       strlcpy(drv_data->adapter.name, ixp4xx_i2c_driver.name,
+               I2C_NAME_SIZE);
        drv_data->adapter.algo_data = &drv_data->algo_data;
 
        drv_data->adapter.dev.parent = &plat_dev->dev;