Message ID | 1468269877-9900-1-git-send-email-javier@osg.samsung.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 11/07/16 23:44, Javier Martinez Canillas wrote: > 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. > > Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> > --- > > drivers/video/fbdev/bfin_adv7393fb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/video/fbdev/bfin_adv7393fb.c b/drivers/video/fbdev/bfin_adv7393fb.c > index 8fe41caac38e..9a01cd7ca73c 100644 > --- a/drivers/video/fbdev/bfin_adv7393fb.c > +++ b/drivers/video/fbdev/bfin_adv7393fb.c > @@ -795,7 +795,7 @@ static struct i2c_driver bfin_adv7393_fb_driver = { > > static int __init bfin_adv7393_fb_driver_init(void) > { > -#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) > +#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI) > request_module("i2c-bfin-twi"); > #else > request_module("i2c-gpio"); > Thanks, queued for v4.9. Tomi
diff --git a/drivers/video/fbdev/bfin_adv7393fb.c b/drivers/video/fbdev/bfin_adv7393fb.c index 8fe41caac38e..9a01cd7ca73c 100644 --- a/drivers/video/fbdev/bfin_adv7393fb.c +++ b/drivers/video/fbdev/bfin_adv7393fb.c @@ -795,7 +795,7 @@ static struct i2c_driver bfin_adv7393_fb_driver = { static int __init bfin_adv7393_fb_driver_init(void) { -#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) +#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI) request_module("i2c-bfin-twi"); #else request_module("i2c-gpio");
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. Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> --- drivers/video/fbdev/bfin_adv7393fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)