summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb-frontends/tda1002x.h
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2013-01-20 05:32:56 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-02-06 12:24:09 +0100
commit7b34be71db533f3e0cf93d53cf62d036cdb5418a (patch)
treee56ffc7b741157b73b1bebe23523eaaa4f482eb2 /drivers/media/dvb-frontends/tda1002x.h
parent[media] [V2,24/24] v4l2-core/v4l2-common.c: use IS_ENABLED() macro (diff)
downloadlinux-7b34be71db533f3e0cf93d53cf62d036cdb5418a.tar.xz
linux-7b34be71db533f3e0cf93d53cf62d036cdb5418a.zip
[media] use IS_ENABLED() macro
This patch introduces the use of IS_ENABLED() macro. For example, replacing: #if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE)) with: #if IS_ENABLED(CONFIG_I2C) All changes made by this patch respect the same replacement pattern. Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com> Acked-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb-frontends/tda1002x.h')
-rw-r--r--drivers/media/dvb-frontends/tda1002x.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/dvb-frontends/tda1002x.h b/drivers/media/dvb-frontends/tda1002x.h
index 04d19418bf20..e404b6e44802 100644
--- a/drivers/media/dvb-frontends/tda1002x.h
+++ b/drivers/media/dvb-frontends/tda1002x.h
@@ -57,7 +57,7 @@ struct tda10023_config {
u16 deltaf;
};
-#if defined(CONFIG_DVB_TDA10021) || (defined(CONFIG_DVB_TDA10021_MODULE) && defined(MODULE))
+#if IS_ENABLED(CONFIG_DVB_TDA10021)
extern struct dvb_frontend* tda10021_attach(const struct tda1002x_config* config,
struct i2c_adapter* i2c, u8 pwm);
#else
@@ -69,8 +69,7 @@ static inline struct dvb_frontend* tda10021_attach(const struct tda1002x_config*
}
#endif // CONFIG_DVB_TDA10021
-#if defined(CONFIG_DVB_TDA10023) || \
- (defined(CONFIG_DVB_TDA10023_MODULE) && defined(MODULE))
+#if IS_ENABLED(CONFIG_DVB_TDA10023)
extern struct dvb_frontend *tda10023_attach(
const struct tda10023_config *config,
struct i2c_adapter *i2c, u8 pwm);