Commit 8a1b028b authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

[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: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarDeepak Saxena <dsaxena@plexity.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ca68f119

drivers/i2c/busses/i2c-ixp2000.c

+4 −0
Original line number Diff line number Diff line
@@ -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;

drivers/i2c/busses/i2c-ixp4xx.c

+4 −0
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE