Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b34be71 authored by Peter Senna Tschudin's avatar Peter Senna Tschudin Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: default avatarPeter Senna Tschudin <peter.senna@gmail.com>
Acked-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ffe4db06

drivers/media/dvb-frontends/bcm3510.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ struct bcm3510_config 
	int (*request_firmware)(struct dvb_frontend* fe, const struct firmware **fw, char* name);

};



#if defined(CONFIG_DVB_BCM3510) || (defined(CONFIG_DVB_BCM3510_MODULE) && defined(MODULE))

#if IS_ENABLED(CONFIG_DVB_BCM3510)

extern struct dvb_frontend* bcm3510_attach(const struct bcm3510_config* config,

					   struct i2c_adapter* i2c);

#else

drivers/media/dvb-frontends/cx22700.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct cx22700_config 
	u8 demod_address;

};



#if defined(CONFIG_DVB_CX22700) || (defined(CONFIG_DVB_CX22700_MODULE) && defined(MODULE))

#if IS_ENABLED(CONFIG_DVB_CX22700)

extern struct dvb_frontend* cx22700_attach(const struct cx22700_config* config,

					   struct i2c_adapter* i2c);

#else

drivers/media/dvb-frontends/cx24110.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static inline int cx24110_pll_write(struct dvb_frontend *fe, u32 val) 
	return 0;

}



#if defined(CONFIG_DVB_CX24110) || (defined(CONFIG_DVB_CX24110_MODULE) && defined(MODULE))

#if IS_ENABLED(CONFIG_DVB_CX24110)

extern struct dvb_frontend* cx24110_attach(const struct cx24110_config* config,

					   struct i2c_adapter* i2c);

#else

drivers/media/dvb-frontends/dib0070.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct dib0070_config { 
	u8 vga_filter;

};



#if defined(CONFIG_DVB_TUNER_DIB0070) || (defined(CONFIG_DVB_TUNER_DIB0070_MODULE) && defined(MODULE))

#if IS_ENABLED(CONFIG_DVB_TUNER_DIB0070)

extern struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct dib0070_config *cfg);

extern u16 dib0070_wbd_offset(struct dvb_frontend *);

extern void dib0070_ctrl_agc_filter(struct dvb_frontend *, u8 open);

drivers/media/dvb-frontends/dib0090.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ struct dib0090_config { 
	u8 force_crystal_mode;

};



#if defined(CONFIG_DVB_TUNER_DIB0090) || (defined(CONFIG_DVB_TUNER_DIB0090_MODULE) && defined(MODULE))

#if IS_ENABLED(CONFIG_DVB_TUNER_DIB0090)

extern struct dvb_frontend *dib0090_register(struct dvb_frontend *fe, struct i2c_adapter *i2c, const struct dib0090_config *config);

extern struct dvb_frontend *dib0090_fw_register(struct dvb_frontend *fe, struct i2c_adapter *i2c, const struct dib0090_config *config);

extern void dib0090_dcc_freq(struct dvb_frontend *fe, u8 fast);