Skip to content

Commit

Permalink
[PATCH] i2c: Add missing i2c-ixp2000/4xx adapter name
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jean Delvare authored and Greg Kroah-Hartman committed Oct 28, 2005
1 parent ca68f11 commit 8a1b028
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/i2c/busses/i2c-ixp2000.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions drivers/i2c/busses/i2c-ixp4xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 8a1b028

Please sign in to comment.