From c43e6512058d21f8c2b73856cc2c7f32b032ccdc Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 28 Oct 2014 10:56:10 -0200 Subject: [PATCH] [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 --- drivers/media/dvb-frontends/lgdt3306a.c | 2 +- drivers/media/dvb-frontends/lgdt3306a.h | 8 +++----- 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) static struct dvb_frontend_ops lgdt3306a_ops; struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config, - struct i2c_adapter *i2c_adap) + struct i2c_adapter *i2c_adap) { struct lgdt3306a_state *state = NULL; 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 { int xtalMHz; }; -#if defined(CONFIG_DVB_LGDT3306A) || (defined(CONFIG_DVB_LGDT3306A_MODULE) && \ - defined(MODULE)) -extern +#if IS_ENABLED(CONFIG_DVB_LGDT3306A) struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config, - struct i2c_adapter *i2c_adap); + struct i2c_adapter *i2c_adap); #else static inline struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config, - struct i2c_adapter *i2c_adap) + struct i2c_adapter *i2c_adap) { printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); return NULL; -- 2.34.1