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

[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>

authored by

Peter Senna Tschudin and committed by
Mauro Carvalho Chehab 7b34be71 ffe4db06

+63 -64
+1 -1
drivers/media/dvb-frontends/bcm3510.h
··· 34 34 int (*request_firmware)(struct dvb_frontend* fe, const struct firmware **fw, char* name); 35 35 }; 36 36 37 - #if defined(CONFIG_DVB_BCM3510) || (defined(CONFIG_DVB_BCM3510_MODULE) && defined(MODULE)) 37 + #if IS_ENABLED(CONFIG_DVB_BCM3510) 38 38 extern struct dvb_frontend* bcm3510_attach(const struct bcm3510_config* config, 39 39 struct i2c_adapter* i2c); 40 40 #else
+1 -1
drivers/media/dvb-frontends/cx22700.h
··· 31 31 u8 demod_address; 32 32 }; 33 33 34 - #if defined(CONFIG_DVB_CX22700) || (defined(CONFIG_DVB_CX22700_MODULE) && defined(MODULE)) 34 + #if IS_ENABLED(CONFIG_DVB_CX22700) 35 35 extern struct dvb_frontend* cx22700_attach(const struct cx22700_config* config, 36 36 struct i2c_adapter* i2c); 37 37 #else
+1 -1
drivers/media/dvb-frontends/cx24110.h
··· 46 46 return 0; 47 47 } 48 48 49 - #if defined(CONFIG_DVB_CX24110) || (defined(CONFIG_DVB_CX24110_MODULE) && defined(MODULE)) 49 + #if IS_ENABLED(CONFIG_DVB_CX24110) 50 50 extern struct dvb_frontend* cx24110_attach(const struct cx24110_config* config, 51 51 struct i2c_adapter* i2c); 52 52 #else
+1 -1
drivers/media/dvb-frontends/dib0070.h
··· 48 48 u8 vga_filter; 49 49 }; 50 50 51 - #if defined(CONFIG_DVB_TUNER_DIB0070) || (defined(CONFIG_DVB_TUNER_DIB0070_MODULE) && defined(MODULE)) 51 + #if IS_ENABLED(CONFIG_DVB_TUNER_DIB0070) 52 52 extern struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct dib0070_config *cfg); 53 53 extern u16 dib0070_wbd_offset(struct dvb_frontend *); 54 54 extern void dib0070_ctrl_agc_filter(struct dvb_frontend *, u8 open);
+1 -1
drivers/media/dvb-frontends/dib0090.h
··· 75 75 u8 force_crystal_mode; 76 76 }; 77 77 78 - #if defined(CONFIG_DVB_TUNER_DIB0090) || (defined(CONFIG_DVB_TUNER_DIB0090_MODULE) && defined(MODULE)) 78 + #if IS_ENABLED(CONFIG_DVB_TUNER_DIB0090) 79 79 extern struct dvb_frontend *dib0090_register(struct dvb_frontend *fe, struct i2c_adapter *i2c, const struct dib0090_config *config); 80 80 extern struct dvb_frontend *dib0090_fw_register(struct dvb_frontend *fe, struct i2c_adapter *i2c, const struct dib0090_config *config); 81 81 extern void dib0090_dcc_freq(struct dvb_frontend *fe, u8 fast);
+1 -1
drivers/media/dvb-frontends/dib3000.h
··· 41 41 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl); 42 42 }; 43 43 44 - #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE)) 44 + #if IS_ENABLED(CONFIG_DVB_DIB3000MB) 45 45 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config, 46 46 struct i2c_adapter* i2c, struct dib_fe_xfer_ops *xfer_ops); 47 47 #else
+1 -1
drivers/media/dvb-frontends/dib8000.h
··· 37 37 38 38 #define DEFAULT_DIB8000_I2C_ADDRESS 18 39 39 40 - #if defined(CONFIG_DVB_DIB8000) || (defined(CONFIG_DVB_DIB8000_MODULE) && defined(MODULE)) 40 + #if IS_ENABLED(CONFIG_DVB_DIB8000) 41 41 extern struct dvb_frontend *dib8000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg); 42 42 extern struct i2c_adapter *dib8000_get_i2c_master(struct dvb_frontend *, enum dibx000_i2c_interface, int); 43 43
+1 -1
drivers/media/dvb-frontends/dib9000.h
··· 27 27 28 28 #define DEFAULT_DIB9000_I2C_ADDRESS 18 29 29 30 - #if defined(CONFIG_DVB_DIB9000) || (defined(CONFIG_DVB_DIB9000_MODULE) && defined(MODULE)) 30 + #if IS_ENABLED(CONFIG_DVB_DIB9000) 31 31 extern struct dvb_frontend *dib9000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, const struct dib9000_config *cfg); 32 32 extern int dib9000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods, u8 default_addr, u8 first_addr); 33 33 extern struct i2c_adapter *dib9000_get_tuner_interface(struct dvb_frontend *fe);
+1 -1
drivers/media/dvb-frontends/dvb-pll.h
··· 38 38 * @param pll_desc_id dvb_pll_desc to use. 39 39 * @return Frontend pointer on success, NULL on failure 40 40 */ 41 - #if defined(CONFIG_DVB_PLL) || (defined(CONFIG_DVB_PLL_MODULE) && defined(MODULE)) 41 + #if IS_ENABLED(CONFIG_DVB_PLL) 42 42 extern struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe, 43 43 int pll_addr, 44 44 struct i2c_adapter *i2c,
+1 -1
drivers/media/dvb-frontends/isl6405.h
··· 55 55 #define ISL6405_ENT2 0x20 56 56 #define ISL6405_ISEL2 0x40 57 57 58 - #if defined(CONFIG_DVB_ISL6405) || (defined(CONFIG_DVB_ISL6405_MODULE) && defined(MODULE)) 58 + #if IS_ENABLED(CONFIG_DVB_ISL6405) 59 59 /* override_set and override_clear control which system register bits (above) 60 60 * to always set & clear 61 61 */
+1 -1
drivers/media/dvb-frontends/isl6421.h
··· 39 39 #define ISL6421_ISEL1 0x20 40 40 #define ISL6421_DCL 0x40 41 41 42 - #if defined(CONFIG_DVB_ISL6421) || (defined(CONFIG_DVB_ISL6421_MODULE) && defined(MODULE)) 42 + #if IS_ENABLED(CONFIG_DVB_ISL6421) 43 43 /* override_set and override_clear control which system register bits (above) to always set & clear */ 44 44 extern struct dvb_frontend *isl6421_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 i2c_addr, 45 45 u8 override_set, u8 override_clear);
+1 -1
drivers/media/dvb-frontends/isl6423.h
··· 42 42 u8 mod_extern; 43 43 }; 44 44 45 - #if defined(CONFIG_DVB_ISL6423) || (defined(CONFIG_DVB_ISL6423_MODULE) && defined(MODULE)) 45 + #if IS_ENABLED(CONFIG_DVB_ISL6423) 46 46 47 47 48 48 extern struct dvb_frontend *isl6423_attach(struct dvb_frontend *fe,
+1 -1
drivers/media/dvb-frontends/itd1000.h
··· 29 29 u8 i2c_address; 30 30 }; 31 31 32 - #if defined(CONFIG_DVB_TUNER_ITD1000) || (defined(CONFIG_DVB_TUNER_ITD1000_MODULE) && defined(MODULE)) 32 + #if IS_ENABLED(CONFIG_DVB_TUNER_ITD1000) 33 33 extern struct dvb_frontend *itd1000_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct itd1000_config *cfg); 34 34 #else 35 35 static inline struct dvb_frontend *itd1000_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct itd1000_config *cfg)
+1 -1
drivers/media/dvb-frontends/l64781.h
··· 31 31 u8 demod_address; 32 32 }; 33 33 34 - #if defined(CONFIG_DVB_L64781) || (defined(CONFIG_DVB_L64781_MODULE) && defined(MODULE)) 34 + #if IS_ENABLED(CONFIG_DVB_L64781) 35 35 extern struct dvb_frontend* l64781_attach(const struct l64781_config* config, 36 36 struct i2c_adapter* i2c); 37 37 #else
+1 -1
drivers/media/dvb-frontends/lgdt330x.h
··· 52 52 int clock_polarity_flip; 53 53 }; 54 54 55 - #if defined(CONFIG_DVB_LGDT330X) || (defined(CONFIG_DVB_LGDT330X_MODULE) && defined(MODULE)) 55 + #if IS_ENABLED(CONFIG_DVB_LGDT330X) 56 56 extern struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config, 57 57 struct i2c_adapter* i2c); 58 58 #else
+1 -1
drivers/media/dvb-frontends/mb86a16.h
··· 33 33 34 34 35 35 36 - #if defined(CONFIG_DVB_MB86A16) || (defined(CONFIG_DVB_MB86A16_MODULE) && defined(MODULE)) 36 + #if IS_ENABLED(CONFIG_DVB_MB86A16) 37 37 38 38 extern struct dvb_frontend *mb86a16_attach(const struct mb86a16_config *config, 39 39 struct i2c_adapter *i2c_adap);
+1 -1
drivers/media/dvb-frontends/mt312.h
··· 36 36 unsigned int voltage_inverted:1; 37 37 }; 38 38 39 - #if defined(CONFIG_DVB_MT312) || (defined(CONFIG_DVB_MT312_MODULE) && defined(MODULE)) 39 + #if IS_ENABLED(CONFIG_DVB_MT312) 40 40 struct dvb_frontend *mt312_attach(const struct mt312_config *config, 41 41 struct i2c_adapter *i2c); 42 42 #else
+1 -1
drivers/media/dvb-frontends/mt352.h
··· 51 51 int (*demod_init)(struct dvb_frontend* fe); 52 52 }; 53 53 54 - #if defined(CONFIG_DVB_MT352) || (defined(CONFIG_DVB_MT352_MODULE) && defined(MODULE)) 54 + #if IS_ENABLED(CONFIG_DVB_MT352) 55 55 extern struct dvb_frontend* mt352_attach(const struct mt352_config* config, 56 56 struct i2c_adapter* i2c); 57 57 #else
+1 -1
drivers/media/dvb-frontends/nxt200x.h
··· 42 42 int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured); 43 43 }; 44 44 45 - #if defined(CONFIG_DVB_NXT200X) || (defined(CONFIG_DVB_NXT200X_MODULE) && defined(MODULE)) 45 + #if IS_ENABLED(CONFIG_DVB_NXT200X) 46 46 extern struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config, 47 47 struct i2c_adapter* i2c); 48 48 #else
+1 -1
drivers/media/dvb-frontends/nxt6000.h
··· 33 33 u8 clock_inversion:1; 34 34 }; 35 35 36 - #if defined(CONFIG_DVB_NXT6000) || (defined(CONFIG_DVB_NXT6000_MODULE) && defined(MODULE)) 36 + #if IS_ENABLED(CONFIG_DVB_NXT6000) 37 37 extern struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config, 38 38 struct i2c_adapter* i2c); 39 39 #else
+1 -1
drivers/media/dvb-frontends/or51132.h
··· 34 34 int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured); 35 35 }; 36 36 37 - #if defined(CONFIG_DVB_OR51132) || (defined(CONFIG_DVB_OR51132_MODULE) && defined(MODULE)) 37 + #if IS_ENABLED(CONFIG_DVB_OR51132) 38 38 extern struct dvb_frontend* or51132_attach(const struct or51132_config* config, 39 39 struct i2c_adapter* i2c); 40 40 #else
+1 -1
drivers/media/dvb-frontends/or51211.h
··· 37 37 void (*sleep)(struct dvb_frontend * fe); 38 38 }; 39 39 40 - #if defined(CONFIG_DVB_OR51211) || (defined(CONFIG_DVB_OR51211_MODULE) && defined(MODULE)) 40 + #if IS_ENABLED(CONFIG_DVB_OR51211) 41 41 extern struct dvb_frontend* or51211_attach(const struct or51211_config* config, 42 42 struct i2c_adapter* i2c); 43 43 #else
+1 -1
drivers/media/dvb-frontends/s5h1420.h
··· 40 40 u8 serial_mpeg:1; 41 41 }; 42 42 43 - #if defined(CONFIG_DVB_S5H1420) || (defined(CONFIG_DVB_S5H1420_MODULE) && defined(MODULE)) 43 + #if IS_ENABLED(CONFIG_DVB_S5H1420) 44 44 extern struct dvb_frontend *s5h1420_attach(const struct s5h1420_config *config, 45 45 struct i2c_adapter *i2c); 46 46 extern struct i2c_adapter *s5h1420_get_tuner_i2c_adapter(struct dvb_frontend *fe);
+1 -1
drivers/media/dvb-frontends/sp8870.h
··· 35 35 int (*request_firmware)(struct dvb_frontend* fe, const struct firmware **fw, char* name); 36 36 }; 37 37 38 - #if defined(CONFIG_DVB_SP8870) || (defined(CONFIG_DVB_SP8870_MODULE) && defined(MODULE)) 38 + #if IS_ENABLED(CONFIG_DVB_SP8870) 39 39 extern struct dvb_frontend* sp8870_attach(const struct sp8870_config* config, 40 40 struct i2c_adapter* i2c); 41 41 #else
+1 -1
drivers/media/dvb-frontends/sp887x.h
··· 17 17 int (*request_firmware)(struct dvb_frontend* fe, const struct firmware **fw, char* name); 18 18 }; 19 19 20 - #if defined(CONFIG_DVB_SP887X) || (defined(CONFIG_DVB_SP887X_MODULE) && defined(MODULE)) 20 + #if IS_ENABLED(CONFIG_DVB_SP887X) 21 21 extern struct dvb_frontend* sp887x_attach(const struct sp887x_config* config, 22 22 struct i2c_adapter* i2c); 23 23 #else
+1 -1
drivers/media/dvb-frontends/stb0899_drv.h
··· 142 142 int (*tuner_set_rfsiggain)(struct dvb_frontend *fe, u32 rf_gain); 143 143 }; 144 144 145 - #if defined(CONFIG_DVB_STB0899) || (defined(CONFIG_DVB_STB0899_MODULE) && defined(MODULE)) 145 + #if IS_ENABLED(CONFIG_DVB_STB0899) 146 146 147 147 extern struct dvb_frontend *stb0899_attach(struct stb0899_config *config, 148 148 struct i2c_adapter *i2c);
+1 -1
drivers/media/dvb-frontends/stb6100.h
··· 94 94 u32 reference; 95 95 }; 96 96 97 - #if defined(CONFIG_DVB_STB6100) || (defined(CONFIG_DVB_STB6100_MODULE) && defined(MODULE)) 97 + #if IS_ENABLED(CONFIG_DVB_STB6100) 98 98 99 99 extern struct dvb_frontend *stb6100_attach(struct dvb_frontend *fe, 100 100 const struct stb6100_config *config,
+1 -1
drivers/media/dvb-frontends/stv0297.h
··· 42 42 u8 stop_during_read:1; 43 43 }; 44 44 45 - #if defined(CONFIG_DVB_STV0297) || (defined(CONFIG_DVB_STV0297_MODULE) && defined(MODULE)) 45 + #if IS_ENABLED(CONFIG_DVB_STV0297) 46 46 extern struct dvb_frontend* stv0297_attach(const struct stv0297_config* config, 47 47 struct i2c_adapter* i2c); 48 48 #else
+1 -1
drivers/media/dvb-frontends/stv0299.h
··· 95 95 int (*set_ts_params)(struct dvb_frontend *fe, int is_punctured); 96 96 }; 97 97 98 - #if defined(CONFIG_DVB_STV0299) || (defined(CONFIG_DVB_STV0299_MODULE) && defined(MODULE)) 98 + #if IS_ENABLED(CONFIG_DVB_STV0299) 99 99 extern struct dvb_frontend *stv0299_attach(const struct stv0299_config *config, 100 100 struct i2c_adapter *i2c); 101 101 #else
+1 -1
drivers/media/dvb-frontends/stv090x.h
··· 103 103 void (*tuner_i2c_lock) (struct dvb_frontend *fe, int lock); 104 104 }; 105 105 106 - #if defined(CONFIG_DVB_STV090x) || (defined(CONFIG_DVB_STV090x_MODULE) && defined(MODULE)) 106 + #if IS_ENABLED(CONFIG_DVB_STV090x) 107 107 108 108 extern struct dvb_frontend *stv090x_attach(const struct stv090x_config *config, 109 109 struct i2c_adapter *i2c,
+1 -1
drivers/media/dvb-frontends/stv6110x.h
··· 53 53 }; 54 54 55 55 56 - #if defined(CONFIG_DVB_STV6110x) || (defined(CONFIG_DVB_STV6110x_MODULE) && defined(MODULE)) 56 + #if IS_ENABLED(CONFIG_DVB_STV6110x) 57 57 58 58 extern struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe, 59 59 const struct stv6110x_config *config,
+2 -3
drivers/media/dvb-frontends/tda1002x.h
··· 57 57 u16 deltaf; 58 58 }; 59 59 60 - #if defined(CONFIG_DVB_TDA10021) || (defined(CONFIG_DVB_TDA10021_MODULE) && defined(MODULE)) 60 + #if IS_ENABLED(CONFIG_DVB_TDA10021) 61 61 extern struct dvb_frontend* tda10021_attach(const struct tda1002x_config* config, 62 62 struct i2c_adapter* i2c, u8 pwm); 63 63 #else ··· 69 69 } 70 70 #endif // CONFIG_DVB_TDA10021 71 71 72 - #if defined(CONFIG_DVB_TDA10023) || \ 73 - (defined(CONFIG_DVB_TDA10023_MODULE) && defined(MODULE)) 72 + #if IS_ENABLED(CONFIG_DVB_TDA10023) 74 73 extern struct dvb_frontend *tda10023_attach( 75 74 const struct tda10023_config *config, 76 75 struct i2c_adapter *i2c, u8 pwm);
+1 -1
drivers/media/dvb-frontends/tda1004x.h
··· 117 117 enum tda1004x_demod demod_type; 118 118 }; 119 119 120 - #if defined(CONFIG_DVB_TDA1004X) || (defined(CONFIG_DVB_TDA1004X_MODULE) && defined(MODULE)) 120 + #if IS_ENABLED(CONFIG_DVB_TDA1004X) 121 121 extern struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config, 122 122 struct i2c_adapter* i2c); 123 123
+1 -1
drivers/media/dvb-frontends/tda10086.h
··· 46 46 enum tda10086_xtal xtal_freq; 47 47 }; 48 48 49 - #if defined(CONFIG_DVB_TDA10086) || (defined(CONFIG_DVB_TDA10086_MODULE) && defined(MODULE)) 49 + #if IS_ENABLED(CONFIG_DVB_TDA10086) 50 50 extern struct dvb_frontend* tda10086_attach(const struct tda10086_config* config, 51 51 struct i2c_adapter* i2c); 52 52 #else
+1 -1
drivers/media/dvb-frontends/tda665x.h
··· 31 31 u32 ref_divider; 32 32 }; 33 33 34 - #if defined(CONFIG_DVB_TDA665x) || (defined(CONFIG_DVB_TDA665x_MODULE) && defined(MODULE)) 34 + #if IS_ENABLED(CONFIG_DVB_TDA665x) 35 35 36 36 extern struct dvb_frontend *tda665x_attach(struct dvb_frontend *fe, 37 37 const struct tda665x_config *config,
+1 -1
drivers/media/dvb-frontends/tda8083.h
··· 35 35 u8 demod_address; 36 36 }; 37 37 38 - #if defined(CONFIG_DVB_TDA8083) || (defined(CONFIG_DVB_TDA8083_MODULE) && defined(MODULE)) 38 + #if IS_ENABLED(CONFIG_DVB_TDA8083) 39 39 extern struct dvb_frontend* tda8083_attach(const struct tda8083_config* config, 40 40 struct i2c_adapter* i2c); 41 41 #else
+1 -1
drivers/media/dvb-frontends/tda8261.h
··· 34 34 enum tda8261_step step_size; 35 35 }; 36 36 37 - #if defined(CONFIG_DVB_TDA8261) || (defined(CONFIG_DVB_TDA8261_MODULE) && defined(MODULE)) 37 + #if IS_ENABLED(CONFIG_DVB_TDA8261) 38 38 39 39 extern struct dvb_frontend *tda8261_attach(struct dvb_frontend *fe, 40 40 const struct tda8261_config *config,
+1 -1
drivers/media/dvb-frontends/tda826x.h
··· 35 35 * @param has_loopthrough Set to 1 if the card has a loopthrough RF connector. 36 36 * @return FE pointer on success, NULL on failure. 37 37 */ 38 - #if defined(CONFIG_DVB_TDA826X) || (defined(CONFIG_DVB_TDA826X_MODULE) && defined(MODULE)) 38 + #if IS_ENABLED(CONFIG_DVB_TDA826X) 39 39 extern struct dvb_frontend* tda826x_attach(struct dvb_frontend *fe, int addr, 40 40 struct i2c_adapter *i2c, 41 41 int has_loopthrough);
+1 -1
drivers/media/dvb-frontends/tua6100.h
··· 34 34 #include <linux/i2c.h> 35 35 #include "dvb_frontend.h" 36 36 37 - #if defined(CONFIG_DVB_TUA6100) || (defined(CONFIG_DVB_TUA6100_MODULE) && defined(MODULE)) 37 + #if IS_ENABLED(CONFIG_DVB_TUA6100) 38 38 extern struct dvb_frontend *tua6100_attach(struct dvb_frontend *fe, int addr, struct i2c_adapter *i2c); 39 39 #else 40 40 static inline struct dvb_frontend* tua6100_attach(struct dvb_frontend *fe, int addr, struct i2c_adapter *i2c)
+1 -1
drivers/media/dvb-frontends/ves1820.h
··· 41 41 u8 selagc:1; 42 42 }; 43 43 44 - #if defined(CONFIG_DVB_VES1820) || (defined(CONFIG_DVB_VES1820_MODULE) && defined(MODULE)) 44 + #if IS_ENABLED(CONFIG_DVB_VES1820) 45 45 extern struct dvb_frontend* ves1820_attach(const struct ves1820_config* config, 46 46 struct i2c_adapter* i2c, u8 pwm); 47 47 #else
+1 -1
drivers/media/dvb-frontends/ves1x93.h
··· 40 40 u8 invert_pwm:1; 41 41 }; 42 42 43 - #if defined(CONFIG_DVB_VES1X93) || (defined(CONFIG_DVB_VES1X93_MODULE) && defined(MODULE)) 43 + #if IS_ENABLED(CONFIG_DVB_VES1X93) 44 44 extern struct dvb_frontend* ves1x93_attach(const struct ves1x93_config* config, 45 45 struct i2c_adapter* i2c); 46 46 #else
+1 -1
drivers/media/dvb-frontends/zl10353.h
··· 47 47 u8 pll_0; /* default: 0x15 */ 48 48 }; 49 49 50 - #if defined(CONFIG_DVB_ZL10353) || (defined(CONFIG_DVB_ZL10353_MODULE) && defined(MODULE)) 50 + #if IS_ENABLED(CONFIG_DVB_ZL10353) 51 51 extern struct dvb_frontend* zl10353_attach(const struct zl10353_config *config, 52 52 struct i2c_adapter *i2c); 53 53 #else
+2 -2
drivers/media/pci/cx88/cx88-dvb.c
··· 265 265 .demod_address = 0x08, 266 266 }; 267 267 268 - #if defined(CONFIG_VIDEO_CX88_VP3054) || (defined(CONFIG_VIDEO_CX88_VP3054_MODULE) && defined(MODULE)) 268 + #if IS_ENABLED(CONFIG_VIDEO_CX88_VP3054) 269 269 static int dntv_live_dvbt_pro_demod_init(struct dvb_frontend* fe) 270 270 { 271 271 static const u8 clock_config [] = { 0x89, 0x38, 0x38 }; ··· 1127 1127 } 1128 1128 break; 1129 1129 case CX88_BOARD_DNTV_LIVE_DVB_T_PRO: 1130 - #if defined(CONFIG_VIDEO_CX88_VP3054) || (defined(CONFIG_VIDEO_CX88_VP3054_MODULE) && defined(MODULE)) 1130 + #if IS_ENABLED(CONFIG_VIDEO_CX88_VP3054) 1131 1131 /* MT352 is on a secondary I2C bus made from some GPIO lines */ 1132 1132 fe0->dvb.frontend = dvb_attach(mt352_attach, &dntv_live_dvbt_pro_config, 1133 1133 &dev->vp3054->adap);
+1 -1
drivers/media/pci/cx88/cx88-vp3054-i2c.h
··· 30 30 }; 31 31 32 32 /* ----------------------------------------------------------------------- */ 33 - #if defined(CONFIG_VIDEO_CX88_VP3054) || (defined(CONFIG_VIDEO_CX88_VP3054_MODULE) && defined(MODULE)) 33 + #if IS_ENABLED(CONFIG_VIDEO_CX88_VP3054) 34 34 int vp3054_i2c_probe(struct cx8802_dev *dev); 35 35 void vp3054_i2c_remove(struct cx8802_dev *dev); 36 36 #else
+1 -1
drivers/media/tuners/mt2060.h
··· 30 30 u8 clock_out; /* 0 = off, 1 = CLK/4, 2 = CLK/2, 3 = CLK/1 */ 31 31 }; 32 32 33 - #if defined(CONFIG_MEDIA_TUNER_MT2060) || (defined(CONFIG_MEDIA_TUNER_MT2060_MODULE) && defined(MODULE)) 33 + #if IS_ENABLED(CONFIG_MEDIA_TUNER_MT2060) 34 34 extern struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct mt2060_config *cfg, u16 if1); 35 35 #else 36 36 static inline struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct mt2060_config *cfg, u16 if1)
+1 -1
drivers/media/tuners/mt2063.h
··· 8 8 u32 refclock; 9 9 }; 10 10 11 - #if defined(CONFIG_MEDIA_TUNER_MT2063) || (defined(CONFIG_MEDIA_TUNER_MT2063_MODULE) && defined(MODULE)) 11 + #if IS_ENABLED(CONFIG_MEDIA_TUNER_MT2063) 12 12 struct dvb_frontend *mt2063_attach(struct dvb_frontend *fe, 13 13 struct mt2063_config *config, 14 14 struct i2c_adapter *i2c);
+1 -1
drivers/media/tuners/mt20xx.h
··· 20 20 #include <linux/i2c.h> 21 21 #include "dvb_frontend.h" 22 22 23 - #if defined(CONFIG_MEDIA_TUNER_MT20XX) || (defined(CONFIG_MEDIA_TUNER_MT20XX_MODULE) && defined(MODULE)) 23 + #if IS_ENABLED(CONFIG_MEDIA_TUNER_MT20XX) 24 24 extern struct dvb_frontend *microtune_attach(struct dvb_frontend *fe, 25 25 struct i2c_adapter* i2c_adap, 26 26 u8 i2c_addr);
+1 -1
drivers/media/tuners/mt2131.h
··· 30 30 u8 clock_out; /* 0 = off, 1 = CLK/4, 2 = CLK/2, 3 = CLK/1 */ 31 31 }; 32 32 33 - #if defined(CONFIG_MEDIA_TUNER_MT2131) || (defined(CONFIG_MEDIA_TUNER_MT2131_MODULE) && defined(MODULE)) 33 + #if IS_ENABLED(CONFIG_MEDIA_TUNER_MT2131) 34 34 extern struct dvb_frontend* mt2131_attach(struct dvb_frontend *fe, 35 35 struct i2c_adapter *i2c, 36 36 struct mt2131_config *cfg,
+1 -1
drivers/media/tuners/mt2266.h
··· 24 24 u8 i2c_address; 25 25 }; 26 26 27 - #if defined(CONFIG_MEDIA_TUNER_MT2266) || (defined(CONFIG_MEDIA_TUNER_MT2266_MODULE) && defined(MODULE)) 27 + #if IS_ENABLED(CONFIG_MEDIA_TUNER_MT2266) 28 28 extern struct dvb_frontend * mt2266_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct mt2266_config *cfg); 29 29 #else 30 30 static inline struct dvb_frontend * mt2266_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct mt2266_config *cfg)
+1 -1
drivers/media/tuners/mxl5007t.h
··· 77 77 unsigned int clk_out_enable:1; 78 78 }; 79 79 80 - #if defined(CONFIG_MEDIA_TUNER_MXL5007T) || (defined(CONFIG_MEDIA_TUNER_MXL5007T_MODULE) && defined(MODULE)) 80 + #if IS_ENABLED(CONFIG_MEDIA_TUNER_MXL5007T) 81 81 extern struct dvb_frontend *mxl5007t_attach(struct dvb_frontend *fe, 82 82 struct i2c_adapter *i2c, u8 addr, 83 83 struct mxl5007t_config *cfg);
+1 -1
drivers/media/tuners/qt1010.h
··· 36 36 * @param cfg tuner hw based configuration 37 37 * @return fe pointer on success, NULL on failure 38 38 */ 39 - #if defined(CONFIG_MEDIA_TUNER_QT1010) || (defined(CONFIG_MEDIA_TUNER_QT1010_MODULE) && defined(MODULE)) 39 + #if IS_ENABLED(CONFIG_MEDIA_TUNER_QT1010) 40 40 extern struct dvb_frontend *qt1010_attach(struct dvb_frontend *fe, 41 41 struct i2c_adapter *i2c, 42 42 struct qt1010_config *cfg);
+1 -1
drivers/media/tuners/tda18271.h
··· 121 121 TDA18271_DIGITAL, 122 122 }; 123 123 124 - #if defined(CONFIG_MEDIA_TUNER_TDA18271) || (defined(CONFIG_MEDIA_TUNER_TDA18271_MODULE) && defined(MODULE)) 124 + #if IS_ENABLED(CONFIG_MEDIA_TUNER_TDA18271) 125 125 extern struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr, 126 126 struct i2c_adapter *i2c, 127 127 struct tda18271_config *cfg);
+1 -1
drivers/media/tuners/tda827x.h
··· 50 50 * @param cfg optional callback function pointers. 51 51 * @return FE pointer on success, NULL on failure. 52 52 */ 53 - #if defined(CONFIG_MEDIA_TUNER_TDA827X) || (defined(CONFIG_MEDIA_TUNER_TDA827X_MODULE) && defined(MODULE)) 53 + #if IS_ENABLED(CONFIG_MEDIA_TUNER_TDA827X) 54 54 extern struct dvb_frontend* tda827x_attach(struct dvb_frontend *fe, int addr, 55 55 struct i2c_adapter *i2c, 56 56 struct tda827x_config *cfg);
+1 -1
drivers/media/tuners/tda8290.h
··· 28 28 #define TDA829X_DONT_PROBE 1 29 29 }; 30 30 31 - #if defined(CONFIG_MEDIA_TUNER_TDA8290) || (defined(CONFIG_MEDIA_TUNER_TDA8290_MODULE) && defined(MODULE)) 31 + #if IS_ENABLED(CONFIG_MEDIA_TUNER_TDA8290) 32 32 extern int tda829x_probe(struct i2c_adapter *i2c_adap, u8 i2c_addr); 33 33 34 34 extern struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,
+1 -1
drivers/media/tuners/tda9887.h
··· 21 21 #include "dvb_frontend.h" 22 22 23 23 /* ------------------------------------------------------------------------ */ 24 - #if defined(CONFIG_MEDIA_TUNER_TDA9887) || (defined(CONFIG_MEDIA_TUNER_TDA9887_MODULE) && defined(MODULE)) 24 + #if IS_ENABLED(CONFIG_MEDIA_TUNER_TDA9887) 25 25 extern struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe, 26 26 struct i2c_adapter *i2c_adap, 27 27 u8 i2c_addr);
+1 -1
drivers/media/tuners/tea5761.h
··· 20 20 #include <linux/i2c.h> 21 21 #include "dvb_frontend.h" 22 22 23 - #if defined(CONFIG_MEDIA_TUNER_TEA5761) || (defined(CONFIG_MEDIA_TUNER_TEA5761_MODULE) && defined(MODULE)) 23 + #if IS_ENABLED(CONFIG_MEDIA_TUNER_TEA5761) 24 24 extern int tea5761_autodetection(struct i2c_adapter* i2c_adap, u8 i2c_addr); 25 25 26 26 extern struct dvb_frontend *tea5761_attach(struct dvb_frontend *fe,
+1 -1
drivers/media/tuners/tea5767.h
··· 39 39 enum tea5767_xtal xtal_freq; 40 40 }; 41 41 42 - #if defined(CONFIG_MEDIA_TUNER_TEA5767) || (defined(CONFIG_MEDIA_TUNER_TEA5767_MODULE) && defined(MODULE)) 42 + #if IS_ENABLED(CONFIG_MEDIA_TUNER_TEA5767) 43 43 extern int tea5767_autodetection(struct i2c_adapter* i2c_adap, u8 i2c_addr); 44 44 45 45 extern struct dvb_frontend *tea5767_attach(struct dvb_frontend *fe,
+1 -1
drivers/media/tuners/tuner-simple.h
··· 20 20 #include <linux/i2c.h> 21 21 #include "dvb_frontend.h" 22 22 23 - #if defined(CONFIG_MEDIA_TUNER_SIMPLE) || (defined(CONFIG_MEDIA_TUNER_SIMPLE_MODULE) && defined(MODULE)) 23 + #if IS_ENABLED(CONFIG_MEDIA_TUNER_SIMPLE) 24 24 extern struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe, 25 25 struct i2c_adapter *i2c_adap, 26 26 u8 i2c_addr,
+1 -1
drivers/media/tuners/tuner-xc2028.h
··· 56 56 #define XC2028_RESET_CLK 1 57 57 #define XC2028_I2C_FLUSH 2 58 58 59 - #if defined(CONFIG_MEDIA_TUNER_XC2028) || (defined(CONFIG_MEDIA_TUNER_XC2028_MODULE) && defined(MODULE)) 59 + #if IS_ENABLED(CONFIG_MEDIA_TUNER_XC2028) 60 60 extern struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe, 61 61 struct xc2028_config *cfg); 62 62 #else
+1 -1
drivers/media/tuners/xc4000.h
··· 50 50 * it's passed back to a bridge during tuner_callback(). 51 51 */ 52 52 53 - #if defined(CONFIG_MEDIA_TUNER_XC4000) || (defined(CONFIG_MEDIA_TUNER_XC4000_MODULE) && defined(MODULE)) 53 + #if IS_ENABLED(CONFIG_MEDIA_TUNER_XC4000) 54 54 extern struct dvb_frontend *xc4000_attach(struct dvb_frontend *fe, 55 55 struct i2c_adapter *i2c, 56 56 struct xc4000_config *cfg);
+1 -1
drivers/media/v4l2-core/v4l2-device.c
··· 112 112 /* Unregister subdevs */ 113 113 list_for_each_entry_safe(sd, next, &v4l2_dev->subdevs, list) { 114 114 v4l2_device_unregister_subdev(sd); 115 - #if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE)) 115 + #if IS_ENABLED(CONFIG_I2C) 116 116 if (sd->flags & V4L2_SUBDEV_FL_IS_I2C) { 117 117 struct i2c_client *client = v4l2_get_subdevdata(sd); 118 118