Commit 502ad2a6 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Tony Lindgren
Browse files

ARM: OMAP2+: use IS_ENABLED() instead of checking for built-in or module 



The IS_ENABLED() macro checks if a Kconfig symbol has been enabled either
built-in or as a module, use that macro instead of open coding the same.

Using the macro makes the code more readable by helping abstract away some
of the Kconfig built-in and module enable details.

Signed-off-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent fcebddb9

arch/arm/mach-omap2/board-flash.c

+4 −6
Original line number Diff line number Diff line
@@ -81,8 +81,7 @@ __init board_nor_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs) 
		pr_err("Unable to register NOR device\n");

}



#if defined(CONFIG_MTD_ONENAND_OMAP2) || \

		defined(CONFIG_MTD_ONENAND_OMAP2_MODULE)

#if IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2)

static struct omap_onenand_platform_data board_onenand_data = {

	.dma_channel	= -1,   /* disable DMA in OMAP OneNAND driver */

};
@@ -97,10 +96,9 @@ __init board_onenand_init(struct mtd_partition *onenand_parts, 


	gpmc_onenand_init(&board_onenand_data);

}

#endif /* CONFIG_MTD_ONENAND_OMAP2 || CONFIG_MTD_ONENAND_OMAP2_MODULE */

#endif /* IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2) */



#if defined(CONFIG_MTD_NAND_OMAP2) || \

		defined(CONFIG_MTD_NAND_OMAP2_MODULE)

#if IS_ENABLED(CONFIG_MTD_NAND_OMAP2)



/* Note that all values in this struct are in nanoseconds */

struct gpmc_timings nand_default_timings[1] = {
@@ -144,7 +142,7 @@ __init board_nand_init(struct mtd_partition *nand_parts, u8 nr_parts, u8 cs, 
	board_nand_data.ecc_opt = OMAP_ECC_HAM1_CODE_SW;

	gpmc_nand_init(&board_nand_data, gpmc_t);

}

#endif /* CONFIG_MTD_NAND_OMAP2 || CONFIG_MTD_NAND_OMAP2_MODULE */

#endif /* IS_ENABLED(CONFIG_MTD_NAND_OMAP2) */



/**

 * get_gpmc0_type - Reads the FPGA DIP_SWITCH_INPUT_REGISTER2 to get

arch/arm/mach-omap2/board-flash.h

+3 −8
Original line number Diff line number Diff line
@@ -23,10 +23,7 @@ struct flash_partitions { 
	int nr_parts;

};



#if defined(CONFIG_MTD_NAND_OMAP2) || \

		defined(CONFIG_MTD_NAND_OMAP2_MODULE) || \

		defined(CONFIG_MTD_ONENAND_OMAP2) || \

		defined(CONFIG_MTD_ONENAND_OMAP2_MODULE)

#if IS_ENABLED(CONFIG_MTD_NAND_OMAP2) || IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2)

extern void board_flash_init(struct flash_partitions [],

				char chip_sel[][GPMC_CS_NUM], int nand_type);

#else
@@ -36,8 +33,7 @@ static inline void board_flash_init(struct flash_partitions part[], 
}

#endif



#if defined(CONFIG_MTD_NAND_OMAP2) || \

		defined(CONFIG_MTD_NAND_OMAP2_MODULE)

#if IS_ENABLED(CONFIG_MTD_NAND_OMAP2)

extern void board_nand_init(struct mtd_partition *nand_parts,

		u8 nr_parts, u8 cs, int nand_type, struct gpmc_timings *gpmc_t);

extern struct gpmc_timings nand_default_timings[];
@@ -49,8 +45,7 @@ static inline void board_nand_init(struct mtd_partition *nand_parts, 
#define	nand_default_timings	NULL

#endif



#if defined(CONFIG_MTD_ONENAND_OMAP2) || \

		defined(CONFIG_MTD_ONENAND_OMAP2_MODULE)

#if IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2)

extern void board_onenand_init(struct mtd_partition *nand_parts,

					u8 nr_parts, u8 cs);

#else

arch/arm/mach-omap2/board-n8x0.c

+2 −3
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static void board_check_revision(void) 
		pr_err("Unknown board\n");

}



#if defined(CONFIG_USB_MUSB_TUSB6010) || defined(CONFIG_USB_MUSB_TUSB6010_MODULE)

#if IS_ENABLED(CONFIG_USB_MUSB_TUSB6010)

/*

 * Enable or disable power to TUSB6010. When enabling, turn on 3.3 V and

 * 1.5 V voltage regulators of PM companion chip. Companion chip will then
@@ -163,8 +163,7 @@ static struct spi_board_info n800_spi_board_info[] __initdata = { 
	},

};



#if defined(CONFIG_MENELAUS) &&						\

	(defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE))

#if defined(CONFIG_MENELAUS) && IS_ENABLED(CONFIG_MMC_OMAP)



/*

 * On both N800 and N810, only the first of the two MMC controllers is in use.

arch/arm/mach-omap2/board-rx51-peripherals.c

+11 −12
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ enum { 
static struct wl1251_platform_data wl1251_pdata;

static struct tsc2005_platform_data tsc2005_pdata;



#if defined(CONFIG_SENSORS_LIS3_I2C) || defined(CONFIG_SENSORS_LIS3_I2C_MODULE)

#if IS_ENABLED(CONFIG_SENSORS_LIS3_I2C)

static int lis302_setup(void)

{

	int err;
@@ -156,13 +156,13 @@ static struct lis3lv02d_platform_data rx51_lis3lv02d_data = { 
};

#endif



#if defined(CONFIG_SENSORS_TSL2563) || defined(CONFIG_SENSORS_TSL2563_MODULE)

#if IS_ENABLED(CONFIG_SENSORS_TSL2563)

static struct tsl2563_platform_data rx51_tsl2563_platform_data = {

	.cover_comp_gain = 16,

};

#endif



#if defined(CONFIG_LEDS_LP5523) || defined(CONFIG_LEDS_LP5523_MODULE)

#if IS_ENABLED(CONFIG_LEDS_LP5523)

static struct lp55xx_led_config rx51_lp5523_led_config[] = {

	{

		.name		= "lp5523:kb1",
@@ -299,7 +299,7 @@ static void __init rx51_charger_init(void) 
	platform_device_register(&rx51_charger_device);

}



#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)

#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)



#define RX51_GPIO_CAMERA_LENS_COVER	110

#define RX51_GPIO_CAMERA_FOCUS		68
@@ -377,7 +377,7 @@ static void __init rx51_add_gpio_keys(void) 
static void __init rx51_add_gpio_keys(void)

{

}

#endif /* CONFIG_KEYBOARD_GPIO || CONFIG_KEYBOARD_GPIO_MODULE */

#endif /* IS_ENABLED(CONFIG_KEYBOARD_GPIO) */



static uint32_t board_keymap[] = {

	/*
@@ -1018,13 +1018,13 @@ static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = { 
		I2C_BOARD_INFO("tlv320aic3x", 0x19),

		.platform_data = &rx51_aic3x_data2,

	},

#if defined(CONFIG_SENSORS_TSL2563) || defined(CONFIG_SENSORS_TSL2563_MODULE)

#if IS_ENABLED(CONFIG_SENSORS_TSL2563)

	{

		I2C_BOARD_INFO("tsl2563", 0x29),

		.platform_data = &rx51_tsl2563_platform_data,

	},

#endif

#if defined(CONFIG_LEDS_LP5523) || defined(CONFIG_LEDS_LP5523_MODULE)

#if IS_ENABLED(CONFIG_LEDS_LP5523)

	{

		I2C_BOARD_INFO("lp5523", 0x32),

		.platform_data  = &rx51_lp5523_platform_data,
@@ -1040,7 +1040,7 @@ static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = { 
};



static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_3[] = {

#if defined(CONFIG_SENSORS_LIS3_I2C) || defined(CONFIG_SENSORS_LIS3_I2C_MODULE)

#if IS_ENABLED(CONFIG_SENSORS_LIS3_I2C)

	{

		I2C_BOARD_INFO("lis3lv02d", 0x1d),

		.platform_data = &rx51_lis3lv02d_data,
@@ -1081,7 +1081,7 @@ static int __init rx51_i2c_init(void) 
#endif

	omap_register_i2c_bus(2, 100, rx51_peripherals_i2c_board_info_2,

			      ARRAY_SIZE(rx51_peripherals_i2c_board_info_2));

#if defined(CONFIG_SENSORS_LIS3_I2C) || defined(CONFIG_SENSORS_LIS3_I2C_MODULE)

#if IS_ENABLED(CONFIG_SENSORS_LIS3_I2C)

	rx51_lis3lv02d_data.irq2 = gpio_to_irq(LIS302_IRQ2_GPIO);

	rx51_peripherals_i2c_board_info_3[0].irq = gpio_to_irq(LIS302_IRQ1_GPIO);

#endif
@@ -1090,8 +1090,7 @@ static int __init rx51_i2c_init(void) 
	return 0;

}



#if defined(CONFIG_MTD_ONENAND_OMAP2) || \

	defined(CONFIG_MTD_ONENAND_OMAP2_MODULE)

#if IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2)



static struct mtd_partition onenand_partitions[] = {

	{
@@ -1239,7 +1238,7 @@ static struct pwm_omap_dmtimer_pdata __maybe_unused pwm_dmtimer_pdata = { 
};

#endif



#if defined(CONFIG_IR_RX51) || defined(CONFIG_IR_RX51_MODULE)

#if IS_ENABLED(CONFIG_IR_RX51)

static struct lirc_rx51_platform_data rx51_lirc_data = {

	.set_max_mpu_wakeup_lat = omap_pm_set_max_mpu_wakeup_lat,

};

arch/arm/mach-omap2/board-rx51-video.c

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 


#define RX51_LCD_RESET_GPIO	90



#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)

#if IS_ENABLED(CONFIG_FB_OMAP2)



static struct connector_atv_platform_data rx51_tv_pdata = {

	.name = "tv",
@@ -64,4 +64,4 @@ static int __init rx51_video_init(void) 
}



omap_subsys_initcall(rx51_video_init);

#endif /* defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE) */
 
#endif /* IS_ENABLED(CONFIG_FB_OMAP2) */

CRA Git | Maintained and supported by SUSTech CRA and CCSE