aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-10-28 08:56:10 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-03-03 08:34:12 -0500
commitc43e6512058d21f8c2b73856cc2c7f32b032ccdc (patch)
tree8bc5851d90c9cd369fe35921d94a626505b41b0f
parent4937ba94a0b024b15711b7c184dc4e5a660d900c (diff)
[media] lgdt3306a: Use IS_ENABLED() for attach function
Simplify the check if CONFIG_DVB_LGDT3306A is enabled, use the IS_ENABLED() macro, just like the other frontend modules. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/dvb-frontends/lgdt3306a.c2
-rw-r--r--drivers/media/dvb-frontends/lgdt3306a.h8
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/media/dvb-frontends/lgdt3306a.c b/drivers/media/dvb-frontends/lgdt3306a.c
index 99128d2afebb..c8af071ce40b 100644
--- a/drivers/media/dvb-frontends/lgdt3306a.c
+++ b/drivers/media/dvb-frontends/lgdt3306a.c
@@ -1662,7 +1662,7 @@ static void lgdt3306a_release(struct dvb_frontend *fe)
1662static struct dvb_frontend_ops lgdt3306a_ops; 1662static struct dvb_frontend_ops lgdt3306a_ops;
1663 1663
1664struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config, 1664struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config,
1665 struct i2c_adapter *i2c_adap) 1665 struct i2c_adapter *i2c_adap)
1666{ 1666{
1667 struct lgdt3306a_state *state = NULL; 1667 struct lgdt3306a_state *state = NULL;
1668 int ret; 1668 int ret;
diff --git a/drivers/media/dvb-frontends/lgdt3306a.h b/drivers/media/dvb-frontends/lgdt3306a.h
index 9d97df8f0969..9e848b1e506e 100644
--- a/drivers/media/dvb-frontends/lgdt3306a.h
+++ b/drivers/media/dvb-frontends/lgdt3306a.h
@@ -63,15 +63,13 @@ struct lgdt3306a_config {
63 int xtalMHz; 63 int xtalMHz;
64}; 64};
65 65
66#if defined(CONFIG_DVB_LGDT3306A) || (defined(CONFIG_DVB_LGDT3306A_MODULE) && \ 66#if IS_ENABLED(CONFIG_DVB_LGDT3306A)
67 defined(MODULE))
68extern
69struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config, 67struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config,
70 struct i2c_adapter *i2c_adap); 68 struct i2c_adapter *i2c_adap);
71#else 69#else
72static inline 70static inline
73struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config, 71struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config,
74 struct i2c_adapter *i2c_adap) 72 struct i2c_adapter *i2c_adap)
75{ 73{
76 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); 74 printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
77 return NULL; 75 return NULL;