Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] [V2,24/24] v4l2-core/v4l2-common.c: use IS_ENABLED() macro

replace:
#if defined(CONFIG_MEDIA_TUNER_TEA5761) || \
defined(CONFIG_MEDIA_TUNER_TEA5761_MODULE)
with:
#if IS_ENABLED(CONFIG_MEDIA_TUNER_TEA5761)
This change was made for: CONFIG_MEDIA_TUNER_TEA5761
Also replaced:
#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))
with:
#if IS_ENABLED(CONFIG_I2C)

Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Peter Senna Tschudin and committed by
Mauro Carvalho Chehab
ffe4db06 6a29b808

+2 -2
+2 -2
drivers/media/v4l2-core/v4l2-common.c
··· 238 238 } 239 239 EXPORT_SYMBOL(v4l2_chip_match_host); 240 240 241 - #if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE)) 241 + #if IS_ENABLED(CONFIG_I2C) 242 242 int v4l2_chip_match_i2c_client(struct i2c_client *c, const struct v4l2_dbg_match *match) 243 243 { 244 244 int len; ··· 384 384 const unsigned short *v4l2_i2c_tuner_addrs(enum v4l2_i2c_tuner_type type) 385 385 { 386 386 static const unsigned short radio_addrs[] = { 387 - #if defined(CONFIG_MEDIA_TUNER_TEA5761) || defined(CONFIG_MEDIA_TUNER_TEA5761_MODULE) 387 + #if IS_ENABLED(CONFIG_MEDIA_TUNER_TEA5761) 388 388 0x10, 389 389 #endif 390 390 0x60,