Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2678479c authored by Mike Frysinger's avatar Mike Frysinger Committed by Bryan Wu
Browse files

Blackfin arch: drop CONFIG_I2C_BOARDINFO ifdefs 



Drop CONFIG_I2C_BOARDINFO ifdefs as the common i2c header handles this
already by stubbing things out

Signed-off-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent a6595bf0

arch/blackfin/mach-bf518/boards/ezbrd.c

+0 −6
Original line number Diff line number Diff line
@@ -473,7 +473,6 @@ static struct platform_device i2c_bfin_twi_device = { 
};

#endif



#ifdef CONFIG_I2C_BOARDINFO

static struct i2c_board_info __initdata bfin_i2c_board_info[] = {

#if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE)

	{
@@ -487,7 +486,6 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { 
	},

#endif

};

#endif



#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)

static struct platform_device bfin_sport0_uart_device = {
@@ -632,12 +630,8 @@ static struct platform_device *stamp_devices[] __initdata = { 
static int __init ezbrd_init(void)

{

	printk(KERN_INFO "%s(): registering device resources\n", __func__);



#ifdef CONFIG_I2C_BOARDINFO

	i2c_register_board_info(0, bfin_i2c_board_info,

				ARRAY_SIZE(bfin_i2c_board_info));

#endif



	platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));

	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));

	return 0;

arch/blackfin/mach-bf527/boards/cm_bf527.c

+0 −6
Original line number Diff line number Diff line
@@ -793,7 +793,6 @@ static struct platform_device i2c_bfin_twi_device = { 
};

#endif



#ifdef CONFIG_I2C_BOARDINFO

static struct i2c_board_info __initdata bfin_i2c_board_info[] = {

#if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE)

	{
@@ -809,7 +808,6 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { 
	},

#endif

};

#endif



#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)

static struct platform_device bfin_sport0_uart_device = {
@@ -971,12 +969,8 @@ static struct platform_device *stamp_devices[] __initdata = { 
static int __init stamp_init(void)

{

	printk(KERN_INFO "%s(): registering device resources\n", __func__);



#ifdef CONFIG_I2C_BOARDINFO

	i2c_register_board_info(0, bfin_i2c_board_info,

				ARRAY_SIZE(bfin_i2c_board_info));

#endif



	platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));

	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));

	return 0;

arch/blackfin/mach-bf527/boards/ezbrd.c

+0 −6
Original line number Diff line number Diff line
@@ -590,7 +590,6 @@ static struct platform_device i2c_bfin_twi_device = { 
};

#endif



#ifdef CONFIG_I2C_BOARDINFO

static struct i2c_board_info __initdata bfin_i2c_board_info[] = {

#if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE)

	{
@@ -604,7 +603,6 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { 
	},

#endif

};

#endif



#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)

static struct platform_device bfin_sport0_uart_device = {
@@ -767,12 +765,8 @@ static struct platform_device *stamp_devices[] __initdata = { 
static int __init stamp_init(void)

{

	printk(KERN_INFO "%s(): registering device resources\n", __func__);



#ifdef CONFIG_I2C_BOARDINFO

	i2c_register_board_info(0, bfin_i2c_board_info,

				ARRAY_SIZE(bfin_i2c_board_info));

#endif



	platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));

	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));

	return 0;

arch/blackfin/mach-bf527/boards/ezkit.c

+0 −6
Original line number Diff line number Diff line
@@ -830,7 +830,6 @@ static struct platform_device i2c_bfin_twi_device = { 
};

#endif



#ifdef CONFIG_I2C_BOARDINFO

static struct i2c_board_info __initdata bfin_i2c_board_info[] = {

#if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE)

	{
@@ -844,7 +843,6 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { 
	},

#endif

};

#endif



#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)

static struct platform_device bfin_sport0_uart_device = {
@@ -1051,12 +1049,8 @@ static struct platform_device *stamp_devices[] __initdata = { 
static int __init stamp_init(void)

{

	printk(KERN_INFO "%s(): registering device resources\n", __func__);



#ifdef CONFIG_I2C_BOARDINFO

	i2c_register_board_info(0, bfin_i2c_board_info,

				ARRAY_SIZE(bfin_i2c_board_info));

#endif



	platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));

	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));

	return 0;

arch/blackfin/mach-bf533/boards/blackstamp.c

+0 −4
Original line number Diff line number Diff line
@@ -309,10 +309,8 @@ static struct platform_device i2c_gpio_device = { 
};

#endif



#ifdef CONFIG_I2C_BOARDINFO

static struct i2c_board_info __initdata bfin_i2c_board_info[] = {

};

#endif



static const unsigned int cclk_vlev_datasheet[] =

{
@@ -390,10 +388,8 @@ static int __init blackstamp_init(void) 


	printk(KERN_INFO "%s(): registering device resources\n", __func__);



#ifdef CONFIG_I2C_BOARDINFO

	i2c_register_board_info(0, bfin_i2c_board_info,

				ARRAY_SIZE(bfin_i2c_board_info));

#endif



	ret = platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));

	if (ret < 0)