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] dvb-frontends: use IS_ENABLED

Instead of checking everywhere there for 3 symbols, use instead
IS_ENABLED macro.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Mauro Carvalho Chehab 782d8b74 54d80904

+108 -96
+3 -2
drivers/media/dvb-frontends/a8293.h
··· 21 21 #ifndef A8293_H 22 22 #define A8293_H 23 23 24 + #include <linux/kconfig.h> 25 + 24 26 struct a8293_config { 25 27 u8 i2c_addr; 26 28 }; 27 29 28 - #if defined(CONFIG_DVB_A8293) || \ 29 - (defined(CONFIG_DVB_A8293_MODULE) && defined(MODULE)) 30 + #if IS_ENABLED(CONFIG_DVB_A8293) 30 31 extern struct dvb_frontend *a8293_attach(struct dvb_frontend *fe, 31 32 struct i2c_adapter *i2c, const struct a8293_config *cfg); 32 33 #else
+2 -2
drivers/media/dvb-frontends/af9013.h
··· 25 25 #ifndef AF9013_H 26 26 #define AF9013_H 27 27 28 + #include <linux/kconfig.h> 28 29 #include <linux/dvb/frontend.h> 29 30 30 31 /* AF9013/5 GPIOs (mostly guessed) ··· 103 102 u8 gpio[4]; 104 103 }; 105 104 106 - #if defined(CONFIG_DVB_AF9013) || \ 107 - (defined(CONFIG_DVB_AF9013_MODULE) && defined(MODULE)) 105 + #if IS_ENABLED(CONFIG_DVB_AF9013) 108 106 extern struct dvb_frontend *af9013_attach(const struct af9013_config *config, 109 107 struct i2c_adapter *i2c); 110 108 #else
+3 -2
drivers/media/dvb-frontends/af9033.h
··· 22 22 #ifndef AF9033_H 23 23 #define AF9033_H 24 24 25 + #include <linux/kconfig.h> 26 + 25 27 struct af9033_config { 26 28 /* 27 29 * I2C address ··· 78 76 }; 79 77 80 78 81 - #if defined(CONFIG_DVB_AF9033) || \ 82 - (defined(CONFIG_DVB_AF9033_MODULE) && defined(MODULE)) 79 + #if IS_ENABLED(CONFIG_DVB_AF9033) 83 80 extern struct dvb_frontend *af9033_attach(const struct af9033_config *config, 84 81 struct i2c_adapter *i2c); 85 82 #else
+2 -2
drivers/media/dvb-frontends/atbm8830.h
··· 22 22 #ifndef __ATBM8830_H__ 23 23 #define __ATBM8830_H__ 24 24 25 + #include <linux/kconfig.h> 25 26 #include <linux/dvb/frontend.h> 26 27 #include <linux/i2c.h> 27 28 ··· 61 60 u8 agc_hold_loop; 62 61 }; 63 62 64 - #if defined(CONFIG_DVB_ATBM8830) || \ 65 - (defined(CONFIG_DVB_ATBM8830_MODULE) && defined(MODULE)) 63 + #if IS_ENABLED(CONFIG_DVB_ATBM8830) 66 64 extern struct dvb_frontend *atbm8830_attach(const struct atbm8830_config *config, 67 65 struct i2c_adapter *i2c); 68 66 #else
+2 -2
drivers/media/dvb-frontends/au8522.h
··· 22 22 #ifndef __AU8522_H__ 23 23 #define __AU8522_H__ 24 24 25 + #include <linux/kconfig.h> 25 26 #include <linux/dvb/frontend.h> 26 27 27 28 enum au8522_if_freq { ··· 61 60 enum au8522_if_freq qam_if; 62 61 }; 63 62 64 - #if defined(CONFIG_DVB_AU8522) || \ 65 - (defined(CONFIG_DVB_AU8522_MODULE) && defined(MODULE)) 63 + #if IS_ENABLED(CONFIG_DVB_AU8522) 66 64 extern struct dvb_frontend *au8522_attach(const struct au8522_config *config, 67 65 struct i2c_adapter *i2c); 68 66 #else
+2 -2
drivers/media/dvb-frontends/cx22702.h
··· 28 28 #ifndef CX22702_H 29 29 #define CX22702_H 30 30 31 + #include <linux/kconfig.h> 31 32 #include <linux/dvb/frontend.h> 32 33 33 34 struct cx22702_config { ··· 41 40 u8 output_mode; 42 41 }; 43 42 44 - #if defined(CONFIG_DVB_CX22702) || (defined(CONFIG_DVB_CX22702_MODULE) \ 45 - && defined(MODULE)) 43 + #if IS_ENABLED(CONFIG_DVB_CX22702) 46 44 extern struct dvb_frontend *cx22702_attach( 47 45 const struct cx22702_config *config, 48 46 struct i2c_adapter *i2c);
+3 -2
drivers/media/dvb-frontends/cx24113.h
··· 22 22 #ifndef CX24113_H 23 23 #define CX24113_H 24 24 25 + #include <linux/kconfig.h> 26 + 25 27 struct dvb_frontend; 26 28 27 29 struct cx24113_config { ··· 32 30 u32 xtal_khz; 33 31 }; 34 32 35 - #if defined(CONFIG_DVB_TUNER_CX24113) || \ 36 - (defined(CONFIG_DVB_TUNER_CX24113_MODULE) && defined(MODULE)) 33 + #if IS_ENABLED(CONFIG_DVB_TUNER_CX24113) 37 34 extern struct dvb_frontend *cx24113_attach(struct dvb_frontend *, 38 35 const struct cx24113_config *config, struct i2c_adapter *i2c); 39 36
+2 -2
drivers/media/dvb-frontends/cx24116.h
··· 21 21 #ifndef CX24116_H 22 22 #define CX24116_H 23 23 24 + #include <linux/kconfig.h> 24 25 #include <linux/dvb/frontend.h> 25 26 26 27 struct cx24116_config { ··· 41 40 u16 i2c_wr_max; 42 41 }; 43 42 44 - #if defined(CONFIG_DVB_CX24116) || \ 45 - (defined(CONFIG_DVB_CX24116_MODULE) && defined(MODULE)) 43 + #if IS_ENABLED(CONFIG_DVB_CX24116) 46 44 extern struct dvb_frontend *cx24116_attach( 47 45 const struct cx24116_config *config, 48 46 struct i2c_adapter *i2c);
+2 -2
drivers/media/dvb-frontends/cx24123.h
··· 21 21 #ifndef CX24123_H 22 22 #define CX24123_H 23 23 24 + #include <linux/kconfig.h> 24 25 #include <linux/dvb/frontend.h> 25 26 26 27 struct cx24123_config { ··· 39 38 void (*agc_callback) (struct dvb_frontend *); 40 39 }; 41 40 42 - #if defined(CONFIG_DVB_CX24123) || (defined(CONFIG_DVB_CX24123_MODULE) \ 43 - && defined(MODULE)) 41 + #if IS_ENABLED(CONFIG_DVB_CX24123) 44 42 extern struct dvb_frontend *cx24123_attach(const struct cx24123_config *config, 45 43 struct i2c_adapter *i2c); 46 44 extern struct i2c_adapter *cx24123_get_tuner_i2c_adapter(struct dvb_frontend *);
+2 -2
drivers/media/dvb-frontends/cxd2820r.h
··· 22 22 #ifndef CXD2820R_H 23 23 #define CXD2820R_H 24 24 25 + #include <linux/kconfig.h> 25 26 #include <linux/dvb/frontend.h> 26 27 27 28 #define CXD2820R_GPIO_D (0 << 0) /* disable */ ··· 66 65 }; 67 66 68 67 69 - #if defined(CONFIG_DVB_CXD2820R) || \ 70 - (defined(CONFIG_DVB_CXD2820R_MODULE) && defined(MODULE)) 68 + #if IS_ENABLED(CONFIG_DVB_CXD2820R) 71 69 extern struct dvb_frontend *cxd2820r_attach( 72 70 const struct cxd2820r_config *config, 73 71 struct i2c_adapter *i2c,
+3 -2
drivers/media/dvb-frontends/dib3000mc.h
··· 13 13 #ifndef DIB3000MC_H 14 14 #define DIB3000MC_H 15 15 16 + #include <linux/kconfig.h> 17 + 16 18 #include "dibx000_common.h" 17 19 18 20 struct dib3000mc_config { ··· 41 39 #define DEFAULT_DIB3000MC_I2C_ADDRESS 16 42 40 #define DEFAULT_DIB3000P_I2C_ADDRESS 24 43 41 44 - #if defined(CONFIG_DVB_DIB3000MC) || (defined(CONFIG_DVB_DIB3000MC_MODULE) && \ 45 - defined(MODULE)) 42 + #if IS_ENABLED(CONFIG_DVB_DIB3000MC) 46 43 extern struct dvb_frontend *dib3000mc_attach(struct i2c_adapter *i2c_adap, 47 44 u8 i2c_addr, 48 45 struct dib3000mc_config *cfg);
+3 -2
drivers/media/dvb-frontends/dib7000m.h
··· 1 1 #ifndef DIB7000M_H 2 2 #define DIB7000M_H 3 3 4 + #include <linux/kconfig.h> 5 + 4 6 #include "dibx000_common.h" 5 7 6 8 struct dib7000m_config { ··· 40 38 41 39 #define DEFAULT_DIB7000M_I2C_ADDRESS 18 42 40 43 - #if defined(CONFIG_DVB_DIB7000M) || (defined(CONFIG_DVB_DIB7000M_MODULE) && \ 44 - defined(MODULE)) 41 + #if IS_ENABLED(CONFIG_DVB_DIB7000M) 45 42 extern struct dvb_frontend *dib7000m_attach(struct i2c_adapter *i2c_adap, 46 43 u8 i2c_addr, 47 44 struct dib7000m_config *cfg);
+3 -2
drivers/media/dvb-frontends/dib7000p.h
··· 1 1 #ifndef DIB7000P_H 2 2 #define DIB7000P_H 3 3 4 + #include <linux/kconfig.h> 5 + 4 6 #include "dibx000_common.h" 5 7 6 8 struct dib7000p_config { ··· 46 44 47 45 #define DEFAULT_DIB7000P_I2C_ADDRESS 18 48 46 49 - #if defined(CONFIG_DVB_DIB7000P) || (defined(CONFIG_DVB_DIB7000P_MODULE) && \ 50 - defined(MODULE)) 47 + #if IS_ENABLED(CONFIG_DVB_DIB7000P) 51 48 extern struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg); 52 49 extern struct i2c_adapter *dib7000p_get_i2c_master(struct dvb_frontend *, enum dibx000_i2c_interface, int); 53 50 extern int dib7000p_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 default_addr, struct dib7000p_config cfg[]);
+2 -2
drivers/media/dvb-frontends/drxd.h
··· 24 24 #ifndef _DRXD_H_ 25 25 #define _DRXD_H_ 26 26 27 + #include <linux/kconfig.h> 27 28 #include <linux/types.h> 28 29 #include <linux/i2c.h> 29 30 ··· 52 51 s16(*osc_deviation) (void *priv, s16 dev, int flag); 53 52 }; 54 53 55 - #if defined(CONFIG_DVB_DRXD) || \ 56 - (defined(CONFIG_DVB_DRXD_MODULE) && defined(MODULE)) 54 + #if IS_ENABLED(CONFIG_DVB_DRXD) 57 55 extern 58 56 struct dvb_frontend *drxd_attach(const struct drxd_config *config, 59 57 void *priv, struct i2c_adapter *i2c,
+2 -2
drivers/media/dvb-frontends/drxk.h
··· 1 1 #ifndef _DRXK_H_ 2 2 #define _DRXK_H_ 3 3 4 + #include <linux/kconfig.h> 4 5 #include <linux/types.h> 5 6 #include <linux/i2c.h> 6 7 ··· 53 52 int qam_demod_parameter_count; 54 53 }; 55 54 56 - #if defined(CONFIG_DVB_DRXK) || (defined(CONFIG_DVB_DRXK_MODULE) \ 57 - && defined(MODULE)) 55 + #if IS_ENABLED(CONFIG_DVB_DRXK) 58 56 extern struct dvb_frontend *drxk_attach(const struct drxk_config *config, 59 57 struct i2c_adapter *i2c); 60 58 #else
+2 -2
drivers/media/dvb-frontends/ds3000.h
··· 22 22 #ifndef DS3000_H 23 23 #define DS3000_H 24 24 25 + #include <linux/kconfig.h> 25 26 #include <linux/dvb/frontend.h> 26 27 27 28 struct ds3000_config { ··· 35 34 void (*set_lock_led)(struct dvb_frontend *fe, int offon); 36 35 }; 37 36 38 - #if defined(CONFIG_DVB_DS3000) || \ 39 - (defined(CONFIG_DVB_DS3000_MODULE) && defined(MODULE)) 37 + #if IS_ENABLED(CONFIG_DVB_DS3000) 40 38 extern struct dvb_frontend *ds3000_attach(const struct ds3000_config *config, 41 39 struct i2c_adapter *i2c); 42 40 #else
+2 -2
drivers/media/dvb-frontends/dvb_dummy_fe.h
··· 22 22 #ifndef DVB_DUMMY_FE_H 23 23 #define DVB_DUMMY_FE_H 24 24 25 + #include <linux/kconfig.h> 25 26 #include <linux/dvb/frontend.h> 26 27 #include "dvb_frontend.h" 27 28 28 - #if defined(CONFIG_DVB_DUMMY_FE) || (defined(CONFIG_DVB_DUMMY_FE_MODULE) && \ 29 - defined(MODULE)) 29 + #if IS_ENABLED(CONFIG_DVB_DUMMY_FE) 30 30 extern struct dvb_frontend* dvb_dummy_fe_ofdm_attach(void); 31 31 extern struct dvb_frontend* dvb_dummy_fe_qpsk_attach(void); 32 32 extern struct dvb_frontend* dvb_dummy_fe_qam_attach(void);
+2 -2
drivers/media/dvb-frontends/ec100.h
··· 22 22 #ifndef EC100_H 23 23 #define EC100_H 24 24 25 + #include <linux/kconfig.h> 25 26 #include <linux/dvb/frontend.h> 26 27 27 28 struct ec100_config { ··· 31 30 }; 32 31 33 32 34 - #if defined(CONFIG_DVB_EC100) || \ 35 - (defined(CONFIG_DVB_EC100_MODULE) && defined(MODULE)) 33 + #if IS_ENABLED(CONFIG_DVB_EC100) 36 34 extern struct dvb_frontend *ec100_attach(const struct ec100_config *config, 37 35 struct i2c_adapter *i2c); 38 36 #else
+2 -2
drivers/media/dvb-frontends/hd29l2.h
··· 23 23 #ifndef HD29L2_H 24 24 #define HD29L2_H 25 25 26 + #include <linux/kconfig.h> 26 27 #include <linux/dvb/frontend.h> 27 28 28 29 struct hd29l2_config { ··· 51 50 }; 52 51 53 52 54 - #if defined(CONFIG_DVB_HD29L2) || \ 55 - (defined(CONFIG_DVB_HD29L2_MODULE) && defined(MODULE)) 53 + #if IS_ENABLED(CONFIG_DVB_HD29L2) 56 54 extern struct dvb_frontend *hd29l2_attach(const struct hd29l2_config *config, 57 55 struct i2c_adapter *i2c); 58 56 #else
+2 -2
drivers/media/dvb-frontends/it913x-fe.h
··· 21 21 #ifndef IT913X_FE_H 22 22 #define IT913X_FE_H 23 23 24 + #include <linux/kconfig.h> 24 25 #include <linux/dvb/frontend.h> 25 26 #include "dvb_frontend.h" 26 27 ··· 39 38 u8 read_slevel; 40 39 }; 41 40 42 - #if defined(CONFIG_DVB_IT913X_FE) || (defined(CONFIG_DVB_IT913X_FE_MODULE) && \ 43 - defined(MODULE)) 41 + #if IS_ENABLED(CONFIG_DVB_IT913X_FE) 44 42 extern struct dvb_frontend *it913x_fe_attach(struct i2c_adapter *i2c_adap, 45 43 u8 i2c_addr, struct ite_config *config); 46 44 #else
+2 -2
drivers/media/dvb-frontends/ix2505v.h
··· 20 20 #ifndef DVB_IX2505V_H 21 21 #define DVB_IX2505V_H 22 22 23 + #include <linux/kconfig.h> 23 24 #include <linux/i2c.h> 24 25 #include "dvb_frontend.h" 25 26 ··· 49 48 50 49 }; 51 50 52 - #if defined(CONFIG_DVB_IX2505V) || \ 53 - (defined(CONFIG_DVB_IX2505V_MODULE) && defined(MODULE)) 51 + #if IS_ENABLED(CONFIG_DVB_IX2505V) 54 52 extern struct dvb_frontend *ix2505v_attach(struct dvb_frontend *fe, 55 53 const struct ix2505v_config *config, struct i2c_adapter *i2c); 56 54 #else
+2 -2
drivers/media/dvb-frontends/lg2160.h
··· 22 22 #ifndef _LG2160_H_ 23 23 #define _LG2160_H_ 24 24 25 + #include <linux/kconfig.h> 25 26 #include <linux/i2c.h> 26 27 #include "dvb_frontend.h" 27 28 ··· 67 66 enum lg_chip_type lg_chip; 68 67 }; 69 68 70 - #if defined(CONFIG_DVB_LG2160) || (defined(CONFIG_DVB_LG2160_MODULE) && \ 71 - defined(MODULE)) 69 + #if IS_ENABLED(CONFIG_DVB_LG2160) 72 70 extern 73 71 struct dvb_frontend *lg2160_attach(const struct lg2160_config *config, 74 72 struct i2c_adapter *i2c_adap);
+2 -2
drivers/media/dvb-frontends/lgdt3305.h
··· 22 22 #ifndef _LGDT3305_H_ 23 23 #define _LGDT3305_H_ 24 24 25 + #include <linux/kconfig.h> 25 26 #include <linux/i2c.h> 26 27 #include "dvb_frontend.h" 27 28 ··· 74 73 enum lgdt_demod_chip_type demod_chip; 75 74 }; 76 75 77 - #if defined(CONFIG_DVB_LGDT3305) || (defined(CONFIG_DVB_LGDT3305_MODULE) && \ 78 - defined(MODULE)) 76 + #if IS_ENABLED(CONFIG_DVB_LGDT3305) 79 77 extern 80 78 struct dvb_frontend *lgdt3305_attach(const struct lgdt3305_config *config, 81 79 struct i2c_adapter *i2c_adap);
+2 -2
drivers/media/dvb-frontends/lgs8gl5.h
··· 23 23 #ifndef LGS8GL5_H 24 24 #define LGS8GL5_H 25 25 26 + #include <linux/kconfig.h> 26 27 #include <linux/dvb/frontend.h> 27 28 28 29 struct lgs8gl5_config { ··· 31 30 u8 demod_address; 32 31 }; 33 32 34 - #if defined(CONFIG_DVB_LGS8GL5) || \ 35 - (defined(CONFIG_DVB_LGS8GL5_MODULE) && defined(MODULE)) 33 + #if IS_ENABLED(CONFIG_DVB_LGS8GL5) 36 34 extern struct dvb_frontend *lgs8gl5_attach( 37 35 const struct lgs8gl5_config *config, struct i2c_adapter *i2c); 38 36 #else
+2 -2
drivers/media/dvb-frontends/lgs8gxx.h
··· 26 26 #ifndef __LGS8GXX_H__ 27 27 #define __LGS8GXX_H__ 28 28 29 + #include <linux/kconfig.h> 29 30 #include <linux/dvb/frontend.h> 30 31 #include <linux/i2c.h> 31 32 ··· 80 79 u8 tuner_address; 81 80 }; 82 81 83 - #if defined(CONFIG_DVB_LGS8GXX) || \ 84 - (defined(CONFIG_DVB_LGS8GXX_MODULE) && defined(MODULE)) 82 + #if IS_ENABLED(CONFIG_DVB_LGS8GXX) 85 83 extern struct dvb_frontend *lgs8gxx_attach(const struct lgs8gxx_config *config, 86 84 struct i2c_adapter *i2c); 87 85 #else
+3 -2
drivers/media/dvb-frontends/lnbh24.h
··· 23 23 #ifndef _LNBH24_H 24 24 #define _LNBH24_H 25 25 26 + #include <linux/kconfig.h> 27 + 26 28 /* system register bits */ 27 29 #define LNBH24_OLF 0x01 28 30 #define LNBH24_OTF 0x02 ··· 37 35 38 36 #include <linux/dvb/frontend.h> 39 37 40 - #if defined(CONFIG_DVB_LNBP21) || (defined(CONFIG_DVB_LNBP21_MODULE) \ 41 - && defined(MODULE)) 38 + #if IS_ENABLED(CONFIG_DVB_LNBP21) 42 39 /* override_set and override_clear control which 43 40 system register bits (above) to always set & clear */ 44 41 extern struct dvb_frontend *lnbh24_attach(struct dvb_frontend *fe,
+3 -2
drivers/media/dvb-frontends/lnbp21.h
··· 27 27 #ifndef _LNBP21_H 28 28 #define _LNBP21_H 29 29 30 + #include <linux/kconfig.h> 31 + 30 32 /* system register bits */ 31 33 /* [RO] 0=OK; 1=over current limit flag */ 32 34 #define LNBP21_OLF 0x01 ··· 57 55 58 56 #include <linux/dvb/frontend.h> 59 57 60 - #if defined(CONFIG_DVB_LNBP21) || (defined(CONFIG_DVB_LNBP21_MODULE) \ 61 - && defined(MODULE)) 58 + #if IS_ENABLED(CONFIG_DVB_LNBP21) 62 59 /* override_set and override_clear control which 63 60 system register bits (above) to always set & clear */ 64 61 extern struct dvb_frontend *lnbp21_attach(struct dvb_frontend *fe,
+3 -2
drivers/media/dvb-frontends/lnbp22.h
··· 28 28 #ifndef _LNBP22_H 29 29 #define _LNBP22_H 30 30 31 + #include <linux/kconfig.h> 32 + 31 33 /* Enable */ 32 34 #define LNBP22_EN 0x10 33 35 /* Voltage selection */ ··· 39 37 40 38 #include <linux/dvb/frontend.h> 41 39 42 - #if defined(CONFIG_DVB_LNBP22) || \ 43 - (defined(CONFIG_DVB_LNBP22_MODULE) && defined(MODULE)) 40 + #if IS_ENABLED(CONFIG_DVB_LNBP22) 44 41 /* 45 42 * override_set and override_clear control which system register bits (above) 46 43 * to always set & clear
+2 -2
drivers/media/dvb-frontends/m88rs2000.h
··· 20 20 #ifndef M88RS2000_H 21 21 #define M88RS2000_H 22 22 23 + #include <linux/kconfig.h> 23 24 #include <linux/dvb/frontend.h> 24 25 #include "dvb_frontend.h" 25 26 ··· 41 40 CALL_IS_READ, 42 41 }; 43 42 44 - #if defined(CONFIG_DVB_M88RS2000) || (defined(CONFIG_DVB_M88RS2000_MODULE) && \ 45 - defined(MODULE)) 43 + #if IS_ENABLED(CONFIG_DVB_M88RS2000) 46 44 extern struct dvb_frontend *m88rs2000_attach( 47 45 const struct m88rs2000_config *config, struct i2c_adapter *i2c); 48 46 #else
+2 -2
drivers/media/dvb-frontends/mb86a20s.h
··· 16 16 #ifndef MB86A20S_H 17 17 #define MB86A20S_H 18 18 19 + #include <linux/kconfig.h> 19 20 #include <linux/dvb/frontend.h> 20 21 21 22 /** ··· 34 33 bool is_serial; 35 34 }; 36 35 37 - #if defined(CONFIG_DVB_MB86A20S) || (defined(CONFIG_DVB_MB86A20S_MODULE) \ 38 - && defined(MODULE)) 36 + #if IS_ENABLED(CONFIG_DVB_MB86A20S) 39 37 extern struct dvb_frontend *mb86a20s_attach(const struct mb86a20s_config *config, 40 38 struct i2c_adapter *i2c); 41 39 extern struct i2c_adapter *mb86a20s_get_tuner_i2c_adapter(struct dvb_frontend *);
+2 -2
drivers/media/dvb-frontends/rtl2830.h
··· 21 21 #ifndef RTL2830_H 22 22 #define RTL2830_H 23 23 24 + #include <linux/kconfig.h> 24 25 #include <linux/dvb/frontend.h> 25 26 26 27 struct rtl2830_config { ··· 60 59 u8 agc_targ_val; 61 60 }; 62 61 63 - #if defined(CONFIG_DVB_RTL2830) || \ 64 - (defined(CONFIG_DVB_RTL2830_MODULE) && defined(MODULE)) 62 + #if IS_ENABLED(CONFIG_DVB_RTL2830) 65 63 extern struct dvb_frontend *rtl2830_attach( 66 64 const struct rtl2830_config *config, 67 65 struct i2c_adapter *i2c
+2 -2
drivers/media/dvb-frontends/rtl2832.h
··· 21 21 #ifndef RTL2832_H 22 22 #define RTL2832_H 23 23 24 + #include <linux/kconfig.h> 24 25 #include <linux/dvb/frontend.h> 25 26 26 27 struct rtl2832_config { ··· 55 54 u8 tuner; 56 55 }; 57 56 58 - #if defined(CONFIG_DVB_RTL2832) || \ 59 - (defined(CONFIG_DVB_RTL2832_MODULE) && defined(MODULE)) 57 + #if IS_ENABLED(CONFIG_DVB_RTL2832) 60 58 extern struct dvb_frontend *rtl2832_attach( 61 59 const struct rtl2832_config *cfg, 62 60 struct i2c_adapter *i2c
+2 -2
drivers/media/dvb-frontends/s5h1409.h
··· 22 22 #ifndef __S5H1409_H__ 23 23 #define __S5H1409_H__ 24 24 25 + #include <linux/kconfig.h> 25 26 #include <linux/dvb/frontend.h> 26 27 27 28 struct s5h1409_config { ··· 67 66 u8 hvr1600_opt; 68 67 }; 69 68 70 - #if defined(CONFIG_DVB_S5H1409) || (defined(CONFIG_DVB_S5H1409_MODULE) \ 71 - && defined(MODULE)) 69 + #if IS_ENABLED(CONFIG_DVB_S5H1409) 72 70 extern struct dvb_frontend *s5h1409_attach(const struct s5h1409_config *config, 73 71 struct i2c_adapter *i2c); 74 72 #else
+2 -2
drivers/media/dvb-frontends/s5h1411.h
··· 22 22 #ifndef __S5H1411_H__ 23 23 #define __S5H1411_H__ 24 24 25 + #include <linux/kconfig.h> 25 26 #include <linux/dvb/frontend.h> 26 27 27 28 #define S5H1411_I2C_TOP_ADDR (0x32 >> 1) ··· 69 68 u8 status_mode; 70 69 }; 71 70 72 - #if defined(CONFIG_DVB_S5H1411) || \ 73 - (defined(CONFIG_DVB_S5H1411_MODULE) && defined(MODULE)) 71 + #if IS_ENABLED(CONFIG_DVB_S5H1411) 74 72 extern struct dvb_frontend *s5h1411_attach(const struct s5h1411_config *config, 75 73 struct i2c_adapter *i2c); 76 74 #else
+2 -2
drivers/media/dvb-frontends/s5h1432.h
··· 22 22 #ifndef __S5H1432_H__ 23 23 #define __S5H1432_H__ 24 24 25 + #include <linux/kconfig.h> 25 26 #include <linux/dvb/frontend.h> 26 27 27 28 #define S5H1432_I2C_TOP_ADDR (0x02 >> 1) ··· 75 74 u8 status_mode; 76 75 }; 77 76 78 - #if defined(CONFIG_DVB_S5H1432) || \ 79 - (defined(CONFIG_DVB_S5H1432_MODULE) && defined(MODULE)) 77 + #if IS_ENABLED(CONFIG_DVB_S5H1432) 80 78 extern struct dvb_frontend *s5h1432_attach(const struct s5h1432_config *config, 81 79 struct i2c_adapter *i2c); 82 80 #else
+2 -2
drivers/media/dvb-frontends/s921.h
··· 17 17 #ifndef S921_H 18 18 #define S921_H 19 19 20 + #include <linux/kconfig.h> 20 21 #include <linux/dvb/frontend.h> 21 22 22 23 struct s921_config { ··· 25 24 u8 demod_address; 26 25 }; 27 26 28 - #if defined(CONFIG_DVB_S921) || (defined(CONFIG_DVB_S921_MODULE) \ 29 - && defined(MODULE)) 27 + #if IS_ENABLED(CONFIG_DVB_S921) 30 28 extern struct dvb_frontend *s921_attach(const struct s921_config *config, 31 29 struct i2c_adapter *i2c); 32 30 extern struct i2c_adapter *s921_get_tuner_i2c_adapter(struct dvb_frontend *);
+2 -2
drivers/media/dvb-frontends/si21xx.h
··· 1 1 #ifndef SI21XX_H 2 2 #define SI21XX_H 3 3 4 + #include <linux/kconfig.h> 4 5 #include <linux/dvb/frontend.h> 5 6 #include "dvb_frontend.h" 6 7 ··· 13 12 int min_delay_ms; 14 13 }; 15 14 16 - #if defined(CONFIG_DVB_SI21XX) || \ 17 - (defined(CONFIG_DVB_SI21XX_MODULE) && defined(MODULE)) 15 + #if IS_ENABLED(CONFIG_DVB_SI21XX) 18 16 extern struct dvb_frontend *si21xx_attach(const struct si21xx_config *config, 19 17 struct i2c_adapter *i2c); 20 18 #else
+2 -2
drivers/media/dvb-frontends/stb6000.h
··· 23 23 #ifndef __DVB_STB6000_H__ 24 24 #define __DVB_STB6000_H__ 25 25 26 + #include <linux/kconfig.h> 26 27 #include <linux/i2c.h> 27 28 #include "dvb_frontend.h" 28 29 ··· 35 34 * @param i2c i2c adapter to use. 36 35 * @return FE pointer on success, NULL on failure. 37 36 */ 38 - #if defined(CONFIG_DVB_STB6000) || (defined(CONFIG_DVB_STB6000_MODULE) \ 39 - && defined(MODULE)) 37 + #if IS_ENABLED(CONFIG_DVB_STB6000) 40 38 extern struct dvb_frontend *stb6000_attach(struct dvb_frontend *fe, int addr, 41 39 struct i2c_adapter *i2c); 42 40 #else
+2 -2
drivers/media/dvb-frontends/stv0288.h
··· 27 27 #ifndef STV0288_H 28 28 #define STV0288_H 29 29 30 + #include <linux/kconfig.h> 30 31 #include <linux/dvb/frontend.h> 31 32 #include "dvb_frontend.h" 32 33 ··· 43 42 int (*set_ts_params)(struct dvb_frontend *fe, int is_punctured); 44 43 }; 45 44 46 - #if defined(CONFIG_DVB_STV0288) || (defined(CONFIG_DVB_STV0288_MODULE) && \ 47 - defined(MODULE)) 45 + #if IS_ENABLED(CONFIG_DVB_STV0288) 48 46 extern struct dvb_frontend *stv0288_attach(const struct stv0288_config *config, 49 47 struct i2c_adapter *i2c); 50 48 #else
+2 -2
drivers/media/dvb-frontends/stv0367.h
··· 26 26 #ifndef STV0367_H 27 27 #define STV0367_H 28 28 29 + #include <linux/kconfig.h> 29 30 #include <linux/dvb/frontend.h> 30 31 #include "dvb_frontend.h" 31 32 ··· 39 38 int clk_pol; 40 39 }; 41 40 42 - #if defined(CONFIG_DVB_STV0367) || (defined(CONFIG_DVB_STV0367_MODULE) \ 43 - && defined(MODULE)) 41 + #if IS_ENABLED(CONFIG_DVB_STV0367) 44 42 extern struct 45 43 dvb_frontend *stv0367ter_attach(const struct stv0367_config *config, 46 44 struct i2c_adapter *i2c);
+2 -2
drivers/media/dvb-frontends/stv0900.h
··· 26 26 #ifndef STV0900_H 27 27 #define STV0900_H 28 28 29 + #include <linux/kconfig.h> 29 30 #include <linux/dvb/frontend.h> 30 31 #include "dvb_frontend.h" 31 32 ··· 58 57 void (*set_lock_led)(struct dvb_frontend *fe, int offon); 59 58 }; 60 59 61 - #if defined(CONFIG_DVB_STV0900) || (defined(CONFIG_DVB_STV0900_MODULE) \ 62 - && defined(MODULE)) 60 + #if IS_ENABLED(CONFIG_DVB_STV0900) 63 61 extern struct dvb_frontend *stv0900_attach(const struct stv0900_config *config, 64 62 struct i2c_adapter *i2c, int demod); 65 63 #else
+2 -2
drivers/media/dvb-frontends/stv6110.h
··· 25 25 #ifndef __DVB_STV6110_H__ 26 26 #define __DVB_STV6110_H__ 27 27 28 + #include <linux/kconfig.h> 28 29 #include <linux/i2c.h> 29 30 #include "dvb_frontend.h" 30 31 ··· 46 45 u8 clk_div; /* divisor value for the output clock */ 47 46 }; 48 47 49 - #if defined(CONFIG_DVB_STV6110) || (defined(CONFIG_DVB_STV6110_MODULE) \ 50 - && defined(MODULE)) 48 + #if IS_ENABLED(CONFIG_DVB_STV6110) 51 49 extern struct dvb_frontend *stv6110_attach(struct dvb_frontend *fe, 52 50 const struct stv6110_config *config, 53 51 struct i2c_adapter *i2c);
+2 -2
drivers/media/dvb-frontends/tda10048.h
··· 22 22 #ifndef TDA10048_H 23 23 #define TDA10048_H 24 24 25 + #include <linux/kconfig.h> 25 26 #include <linux/dvb/frontend.h> 26 27 #include <linux/firmware.h> 27 28 ··· 73 72 u8 pll_n; 74 73 }; 75 74 76 - #if defined(CONFIG_DVB_TDA10048) || \ 77 - (defined(CONFIG_DVB_TDA10048_MODULE) && defined(MODULE)) 75 + #if IS_ENABLED(CONFIG_DVB_TDA10048) 78 76 extern struct dvb_frontend *tda10048_attach( 79 77 const struct tda10048_config *config, 80 78 struct i2c_adapter *i2c);
+2 -2
drivers/media/dvb-frontends/tda10071.h
··· 21 21 #ifndef TDA10071_H 22 22 #define TDA10071_H 23 23 24 + #include <linux/kconfig.h> 24 25 #include <linux/dvb/frontend.h> 25 26 26 27 struct tda10071_config { ··· 72 71 }; 73 72 74 73 75 - #if defined(CONFIG_DVB_TDA10071) || \ 76 - (defined(CONFIG_DVB_TDA10071_MODULE) && defined(MODULE)) 74 + #if IS_ENABLED(CONFIG_DVB_TDA10071) 77 75 extern struct dvb_frontend *tda10071_attach( 78 76 const struct tda10071_config *config, struct i2c_adapter *i2c); 79 77 #else
+4 -2
drivers/media/dvb-frontends/tda18271c2dd.h
··· 1 1 #ifndef _TDA18271C2DD_H_ 2 2 #define _TDA18271C2DD_H_ 3 - #if defined(CONFIG_DVB_TDA18271C2DD) || (defined(CONFIG_DVB_TDA18271C2DD_MODULE) \ 4 - && defined(MODULE)) 3 + 4 + #include <linux/kconfig.h> 5 + 6 + #if IS_ENABLED(CONFIG_DVB_TDA18271C2DD) 5 7 struct dvb_frontend *tda18271c2dd_attach(struct dvb_frontend *fe, 6 8 struct i2c_adapter *i2c, u8 adr); 7 9 #else
+2 -2
drivers/media/dvb-frontends/ts2020.h
··· 22 22 #ifndef TS2020_H 23 23 #define TS2020_H 24 24 25 + #include <linux/kconfig.h> 25 26 #include <linux/dvb/frontend.h> 26 27 27 28 struct ts2020_config { ··· 30 29 u8 clk_out_div; 31 30 }; 32 31 33 - #if defined(CONFIG_DVB_TS2020) || \ 34 - (defined(CONFIG_DVB_TS2020_MODULE) && defined(MODULE)) 32 + #if IS_ENABLED(CONFIG_DVB_TS2020) 35 33 36 34 extern struct dvb_frontend *ts2020_attach( 37 35 struct dvb_frontend *fe,
+2 -2
drivers/media/dvb-frontends/zl10036.h
··· 21 21 #ifndef DVB_ZL10036_H 22 22 #define DVB_ZL10036_H 23 23 24 + #include <linux/kconfig.h> 24 25 #include <linux/i2c.h> 25 26 #include "dvb_frontend.h" 26 27 ··· 38 37 int rf_loop_enable; 39 38 }; 40 39 41 - #if defined(CONFIG_DVB_ZL10036) || \ 42 - (defined(CONFIG_DVB_ZL10036_MODULE) && defined(MODULE)) 40 + #if IS_ENABLED(CONFIG_DVB_ZL10036) 43 41 extern struct dvb_frontend *zl10036_attach(struct dvb_frontend *fe, 44 42 const struct zl10036_config *config, struct i2c_adapter *i2c); 45 43 #else
+3 -2
drivers/media/dvb-frontends/zl10039.h
··· 22 22 #ifndef ZL10039_H 23 23 #define ZL10039_H 24 24 25 - #if defined(CONFIG_DVB_ZL10039) || (defined(CONFIG_DVB_ZL10039_MODULE) \ 26 - && defined(MODULE)) 25 + #include <linux/kconfig.h> 26 + 27 + #if IS_ENABLED(CONFIG_DVB_ZL10039) 27 28 struct dvb_frontend *zl10039_attach(struct dvb_frontend *fe, 28 29 u8 i2c_addr, 29 30 struct i2c_adapter *i2c);