dvb-frontends: use IS_ENABLED
Subsystems (20)
Media (V4L/DVB) RTL2832 media driver DVB_USB_MXL111SF media driver AF9033 media driver +16 more subsystems
PATCH v2 1/4 dvb-frontends: use IS_ENABLED
Instead of checking everywhere there for 3 symbols, use instead IS_ENABLED macro.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
--- drivers/media/dvb-frontends/a8293.h | 5 +++-- drivers/media/dvb-frontends/af9013.h | 4 ++-- drivers/media/dvb-frontends/af9033.h | 5 +++-- drivers/media/dvb-frontends/atbm8830.h | 4 ++-- drivers/media/dvb-frontends/au8522.h | 4 ++-- drivers/media/dvb-frontends/cx22702.h | 4 ++-- drivers/media/dvb-frontends/cx24113.h | 5 +++-- drivers/media/dvb-frontends/cx24116.h | 4 ++-- drivers/media/dvb-frontends/cx24123.h | 4 ++-- drivers/media/dvb-frontends/cxd2820r.h | 4 ++-- drivers/media/dvb-frontends/dib3000mc.h | 5 +++-- drivers/media/dvb-frontends/dib7000m.h | 5 +++-- drivers/media/dvb-frontends/dib7000p.h | 5 +++-- drivers/media/dvb-frontends/drxd.h | 4 ++-- drivers/media/dvb-frontends/drxk.h | 4 ++-- drivers/media/dvb-frontends/ds3000.h | 4 ++-- drivers/media/dvb-frontends/dvb_dummy_fe.h | 4 ++-- drivers/media/dvb-frontends/ec100.h | 4 ++-- drivers/media/dvb-frontends/hd29l2.h | 4 ++-- drivers/media/dvb-frontends/it913x-fe.h | 4 ++-- drivers/media/dvb-frontends/ix2505v.h | 4 ++-- drivers/media/dvb-frontends/lg2160.h | 4 ++-- drivers/media/dvb-frontends/lgdt3305.h | 4 ++-- drivers/media/dvb-frontends/lgs8gl5.h | 4 ++-- drivers/media/dvb-frontends/lgs8gxx.h | 4 ++-- drivers/media/dvb-frontends/lnbh24.h | 5 +++-- drivers/media/dvb-frontends/lnbp21.h | 5 +++-- drivers/media/dvb-frontends/lnbp22.h | 5 +++-- drivers/media/dvb-frontends/m88rs2000.h | 4 ++-- drivers/media/dvb-frontends/mb86a20s.h | 4 ++-- drivers/media/dvb-frontends/rtl2830.h | 4 ++-- drivers/media/dvb-frontends/rtl2832.h | 4 ++-- drivers/media/dvb-frontends/s5h1409.h | 4 ++-- drivers/media/dvb-frontends/s5h1411.h | 4 ++-- drivers/media/dvb-frontends/s5h1432.h | 4 ++-- drivers/media/dvb-frontends/s921.h | 4 ++-- drivers/media/dvb-frontends/si21xx.h | 4 ++-- drivers/media/dvb-frontends/stb6000.h | 4 ++-- drivers/media/dvb-frontends/stv0288.h | 4 ++-- drivers/media/dvb-frontends/stv0367.h | 4 ++-- drivers/media/dvb-frontends/stv0900.h | 4 ++-- drivers/media/dvb-frontends/stv6110.h | 4 ++-- drivers/media/dvb-frontends/tda10048.h | 4 ++-- drivers/media/dvb-frontends/tda10071.h | 4 ++-- drivers/media/dvb-frontends/tda18271c2dd.h | 6 ++++-- drivers/media/dvb-frontends/ts2020.h | 4 ++-- drivers/media/dvb-frontends/zl10036.h | 4 ++-- drivers/media/dvb-frontends/zl10039.h | 5 +++-- 48 files changed, 108 insertions(+), 96 deletions(-)
drivers/media/dvb-frontends/a8293.h +3 -2
@@ -21,12 +21,13 @@#ifndef A8293_H #define A8293_H +#include <linux/kconfig.h> +struct a8293_config {u8 i2c_addr; }; -#if defined(CONFIG_DVB_A8293 ) || \ - (defined(CONFIG_DVB_A8293_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_A8293 )extern struct dvb_frontend *a8293_attach (struct dvb_frontend *fe,struct i2c_adapter *i2c,const struct a8293_config *cfg);#else
drivers/media/dvb-frontends/af9013.h +2 -2
@@ -25,6 +25,7 @@#ifndef AF9013_H #define AF9013_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> /* AF9013/5 GPIOs (mostly guessed)
@@ -102,8 +103,7 @@ struct af9013_config {u8 gpio[4 ]; }; -#if defined(CONFIG_DVB_AF9013 ) || \ - (defined(CONFIG_DVB_AF9013_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_AF9013 )extern struct dvb_frontend *af9013_attach (const struct af9013_config *config,struct i2c_adapter *i2c);#else
drivers/media/dvb-frontends/af9033.h +3 -2
@@ -22,6 +22,8 @@#ifndef AF9033_H #define AF9033_H +#include <linux/kconfig.h> + struct af9033_config {/* * I2C address
@@ -76,8 +78,7 @@ struct af9033_config { }; -#if defined(CONFIG_DVB_AF9033 ) || \ - (defined(CONFIG_DVB_AF9033_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_AF9033 )extern struct dvb_frontend *af9033_attach (const struct af9033_config *config,struct i2c_adapter *i2c);#else
drivers/media/dvb-frontends/atbm8830.h +2 -2
@@ -22,6 +22,7 @@#ifndef __ATBM8830_H__#define __ATBM8830_H__ +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> #include <linux/i2c.h>
@@ -60,8 +61,7 @@ struct atbm8830_config {u8 agc_hold_loop; }; -#if defined(CONFIG_DVB_ATBM8830 ) || \ - (defined(CONFIG_DVB_ATBM8830_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_ATBM8830 )extern struct dvb_frontend *atbm8830_attach (const struct atbm8830_config *config,struct i2c_adapter *i2c);#else
drivers/media/dvb-frontends/au8522.h +2 -2
@@ -22,6 +22,7 @@#ifndef __AU8522_H__#define __AU8522_H__ +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> enum au8522_if_freq {
@@ -60,8 +61,7 @@ struct au8522_config {enum au8522_if_freq qam_if; }; -#if defined(CONFIG_DVB_AU8522 ) || \ - (defined(CONFIG_DVB_AU8522_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_AU8522 )extern struct dvb_frontend *au8522_attach (const struct au8522_config *config,struct i2c_adapter *i2c);#else
drivers/media/dvb-frontends/cx22702.h +2 -2
@@ -28,6 +28,7 @@#ifndef CX22702_H #define CX22702_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> struct cx22702_config {
@@ -40,8 +41,7 @@ struct cx22702_config {u8 output_mode; }; -#if defined(CONFIG_DVB_CX22702 ) || (defined(CONFIG_DVB_CX22702_MODULE ) \ - && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_CX22702 )extern struct dvb_frontend *cx22702_attach (const struct cx22702_config *config,struct i2c_adapter *i2c);
drivers/media/dvb-frontends/cx24113.h +3 -2
@@ -22,6 +22,8 @@#ifndef CX24113_H #define CX24113_H +#include <linux/kconfig.h> +struct dvb_frontend ; struct cx24113_config {
@@ -30,8 +32,7 @@ struct cx24113_config {u32 xtal_khz; }; -#if defined(CONFIG_DVB_TUNER_CX24113 ) || \ - (defined(CONFIG_DVB_TUNER_CX24113_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_TUNER_CX24113 )extern struct dvb_frontend *cx24113_attach (struct dvb_frontend *,const struct cx24113_config *config,struct i2c_adapter *i2c);
drivers/media/dvb-frontends/cx24116.h +2 -2
@@ -21,6 +21,7 @@#ifndef CX24116_H #define CX24116_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> struct cx24116_config {
@@ -40,8 +41,7 @@ struct cx24116_config {u16 i2c_wr_max; }; -#if defined(CONFIG_DVB_CX24116 ) || \ - (defined(CONFIG_DVB_CX24116_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_CX24116 )extern struct dvb_frontend *cx24116_attach (const struct cx24116_config *config,struct i2c_adapter *i2c);
drivers/media/dvb-frontends/cx24123.h +2 -2
@@ -21,6 +21,7 @@#ifndef CX24123_H #define CX24123_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> struct cx24123_config {
@@ -38,8 +39,7 @@ struct cx24123_config {void (*agc_callback) (struct dvb_frontend *); }; -#if defined(CONFIG_DVB_CX24123 ) || (defined(CONFIG_DVB_CX24123_MODULE ) \ - && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_CX24123 )extern struct dvb_frontend *cx24123_attach (const struct cx24123_config *config,struct i2c_adapter *i2c);extern struct i2c_adapter *cx24123_get_tuner_i2c_adapter (struct dvb_frontend *);
drivers/media/dvb-frontends/cxd2820r.h +2 -2
@@ -22,6 +22,7 @@#ifndef CXD2820R_H #define CXD2820R_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> #define CXD2820R_GPIO_D (0 << 0)/* disable */
@@ -65,8 +66,7 @@ struct cxd2820r_config { }; -#if defined(CONFIG_DVB_CXD2820R ) || \ - (defined(CONFIG_DVB_CXD2820R_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_CXD2820R ) extern struct dvb_frontend *cxd2820r_attach( const struct cxd2820r_config *config, struct i2c_adapter *i2c,
drivers/media/dvb-frontends/dib3000mc.h +3 -2
@@ -13,6 +13,8 @@#ifndef DIB3000MC_H #define DIB3000MC_H +#include <linux/kconfig.h> +#include "dibx000_common.h" struct dib3000mc_config {
@@ -39,8 +41,7 @@ struct dib3000mc_config {#define DEFAULT_DIB3000MC_I2C_ADDRESS 16#define DEFAULT_DIB3000P_I2C_ADDRESS 24 -#if defined(CONFIG_DVB_DIB3000MC ) || (defined(CONFIG_DVB_DIB3000MC_MODULE ) && \ - defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_DIB3000MC )extern struct dvb_frontend *dib3000mc_attach (struct i2c_adapter *i2c_adap,u8 i2c_addr,struct dib3000mc_config *cfg);
drivers/media/dvb-frontends/dib7000m.h +3 -2
@@ -1,6 +1,8 @@#ifndef DIB7000M_H #define DIB7000M_H +#include <linux/kconfig.h> +#include "dibx000_common.h" struct dib7000m_config {
@@ -38,8 +40,7 @@ struct dib7000m_config {#define DEFAULT_DIB7000M_I2C_ADDRESS 18 -#if defined(CONFIG_DVB_DIB7000M ) || (defined(CONFIG_DVB_DIB7000M_MODULE ) && \ - defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_DIB7000M )extern struct dvb_frontend *dib7000m_attach (struct i2c_adapter *i2c_adap,u8 i2c_addr,struct dib7000m_config *cfg);
drivers/media/dvb-frontends/dib7000p.h +3 -2
@@ -1,6 +1,8 @@#ifndef DIB7000P_H #define DIB7000P_H +#include <linux/kconfig.h> +#include "dibx000_common.h" struct dib7000p_config {
@@ -44,8 +46,7 @@ struct dib7000p_config {#define DEFAULT_DIB7000P_I2C_ADDRESS 18 -#if defined(CONFIG_DVB_DIB7000P ) || (defined(CONFIG_DVB_DIB7000P_MODULE ) && \ - defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_DIB7000P )extern struct dvb_frontend *dib7000p_attach (struct i2c_adapter *i2c_adap,u8 i2c_addr,struct dib7000p_config *cfg);extern struct i2c_adapter *dib7000p_get_i2c_master (struct dvb_frontend *,enum dibx000_i2c_interface ,int );extern int dib7000p_i2c_enumeration (struct i2c_adapter *i2c,int no_of_demods,u8 default_addr,struct dib7000p_config cfg[]);
drivers/media/dvb-frontends/drxd.h +2 -2
@@ -24,6 +24,7 @@#ifndef _DRXD_H_#define _DRXD_H_ +#include <linux/kconfig.h> #include <linux/types.h> #include <linux/i2c.h>
@@ -51,8 +52,7 @@ struct drxd_config {s16 (*osc_deviation) (void *priv,s16 dev,int flag); }; -#if defined(CONFIG_DVB_DRXD ) || \ - (defined(CONFIG_DVB_DRXD_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_DRXD )extern struct dvb_frontend *drxd_attach(const struct drxd_config *config, void *priv, struct i2c_adapter *i2c,
drivers/media/dvb-frontends/drxk.h +2 -2
@@ -1,6 +1,7 @@#ifndef _DRXK_H_#define _DRXK_H_ +#include <linux/kconfig.h> #include <linux/types.h> #include <linux/i2c.h>
@@ -52,8 +53,7 @@ struct drxk_config {int qam_demod_parameter_count; }; -#if defined(CONFIG_DVB_DRXK ) || (defined(CONFIG_DVB_DRXK_MODULE ) \ - && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_DRXK )extern struct dvb_frontend *drxk_attach (const struct drxk_config *config,struct i2c_adapter *i2c);#else
drivers/media/dvb-frontends/ds3000.h +2 -2
@@ -22,6 +22,7 @@#ifndef DS3000_H #define DS3000_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> struct ds3000_config {
@@ -34,8 +35,7 @@ struct ds3000_config {void (*set_lock_led)(struct dvb_frontend *fe,int offon); }; -#if defined(CONFIG_DVB_DS3000 ) || \ - (defined(CONFIG_DVB_DS3000_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_DS3000 )extern struct dvb_frontend *ds3000_attach (const struct ds3000_config *config,struct i2c_adapter *i2c);#else
drivers/media/dvb-frontends/dvb_dummy_fe.h +2 -2
@@ -22,11 +22,11 @@#ifndef DVB_DUMMY_FE_H #define DVB_DUMMY_FE_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> #include "dvb_frontend.h" -#if defined(CONFIG_DVB_DUMMY_FE ) || (defined(CONFIG_DVB_DUMMY_FE_MODULE ) && \ -defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_DUMMY_FE )extern struct dvb_frontend *dvb_dummy_fe_ofdm_attach (void );extern struct dvb_frontend *dvb_dummy_fe_qpsk_attach (void );extern struct dvb_frontend *dvb_dummy_fe_qam_attach (void );
drivers/media/dvb-frontends/ec100.h +2 -2
@@ -22,6 +22,7 @@#ifndef EC100_H #define EC100_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> struct ec100_config {
@@ -30,8 +31,7 @@ struct ec100_config { }; -#if defined(CONFIG_DVB_EC100 ) || \ - (defined(CONFIG_DVB_EC100_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_EC100 )extern struct dvb_frontend *ec100_attach (const struct ec100_config *config,struct i2c_adapter *i2c);#else
drivers/media/dvb-frontends/hd29l2.h +2 -2
@@ -23,6 +23,7 @@#ifndef HD29L2_H #define HD29L2_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> struct hd29l2_config {
@@ -50,8 +51,7 @@ struct hd29l2_config { }; -#if defined(CONFIG_DVB_HD29L2 ) || \ - (defined(CONFIG_DVB_HD29L2_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_HD29L2 )extern struct dvb_frontend *hd29l2_attach (const struct hd29l2_config *config,struct i2c_adapter *i2c);#else
drivers/media/dvb-frontends/it913x-fe.h +2 -2
@@ -21,6 +21,7 @@#ifndef IT913X_FE_H #define IT913X_FE_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> #include "dvb_frontend.h"
@@ -38,8 +39,7 @@ struct ite_config {u8 read_slevel; }; -#if defined(CONFIG_DVB_IT913X_FE ) || (defined(CONFIG_DVB_IT913X_FE_MODULE ) && \ -defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_IT913X_FE )extern struct dvb_frontend *it913x_fe_attach (struct i2c_adapter *i2c_adap,u8 i2c_addr,struct ite_config *config);#else
drivers/media/dvb-frontends/ix2505v.h +2 -2
@@ -20,6 +20,7 @@#ifndef DVB_IX2505V_H #define DVB_IX2505V_H +#include <linux/kconfig.h> #include <linux/i2c.h> #include "dvb_frontend.h"
@@ -48,8 +49,7 @@ struct ix2505v_config { }; -#if defined(CONFIG_DVB_IX2505V ) || \ - (defined(CONFIG_DVB_IX2505V_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_IX2505V )extern struct dvb_frontend *ix2505v_attach (struct dvb_frontend *fe,const struct ix2505v_config *config,struct i2c_adapter *i2c);#else
drivers/media/dvb-frontends/lg2160.h +2 -2
@@ -22,6 +22,7 @@#ifndef _LG2160_H_#define _LG2160_H_ +#include <linux/kconfig.h> #include <linux/i2c.h> #include "dvb_frontend.h"
@@ -66,8 +67,7 @@ struct lg2160_config {enum lg_chip_type lg_chip; }; -#if defined(CONFIG_DVB_LG2160 ) || (defined(CONFIG_DVB_LG2160_MODULE ) && \ - defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_LG2160 )extern struct dvb_frontend *lg2160_attach (const struct lg2160_config *config,struct i2c_adapter *i2c_adap);
drivers/media/dvb-frontends/lgdt3305.h +2 -2
@@ -22,6 +22,7 @@#ifndef _LGDT3305_H_#define _LGDT3305_H_ +#include <linux/kconfig.h> #include <linux/i2c.h> #include "dvb_frontend.h"
@@ -73,8 +74,7 @@ struct lgdt3305_config {enum lgdt_demod_chip_type demod_chip; }; -#if defined(CONFIG_DVB_LGDT3305 ) || (defined(CONFIG_DVB_LGDT3305_MODULE ) && \ - defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_LGDT3305 )extern struct dvb_frontend *lgdt3305_attach (const struct lgdt3305_config *config,struct i2c_adapter *i2c_adap);
drivers/media/dvb-frontends/lgs8gl5.h +2 -2
@@ -23,6 +23,7 @@#ifndef LGS8GL5_H #define LGS8GL5_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> struct lgs8gl5_config {
@@ -30,8 +31,7 @@ struct lgs8gl5_config {u8 demod_address; }; -#if defined(CONFIG_DVB_LGS8GL5 ) || \ - (defined(CONFIG_DVB_LGS8GL5_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_LGS8GL5 )extern struct dvb_frontend *lgs8gl5_attach (const struct lgs8gl5_config *config,struct i2c_adapter *i2c);#else
drivers/media/dvb-frontends/lgs8gxx.h +2 -2
@@ -26,6 +26,7 @@#ifndef __LGS8GXX_H__#define __LGS8GXX_H__ +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> #include <linux/i2c.h>
@@ -79,8 +80,7 @@ struct lgs8gxx_config {u8 tuner_address; }; -#if defined(CONFIG_DVB_LGS8GXX ) || \ - (defined(CONFIG_DVB_LGS8GXX_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_LGS8GXX )extern struct dvb_frontend *lgs8gxx_attach (const struct lgs8gxx_config *config,struct i2c_adapter *i2c);#else
drivers/media/dvb-frontends/lnbh24.h +3 -2
@@ -23,6 +23,8 @@#ifndef _LNBH24_H#define _LNBH24_H +#include <linux/kconfig.h> +/* system register bits */ #define LNBH24_OLF 0x01#define LNBH24_OTF 0x02
@@ -35,8 +37,7 @@#include <linux/dvb/frontend.h> -#if defined(CONFIG_DVB_LNBP21 ) || (defined(CONFIG_DVB_LNBP21_MODULE ) \ - && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_LNBP21 )/* override_set and override_clear control which system register bits (above) to always set & clear */ extern struct dvb_frontend *lnbh24_attach(struct dvb_frontend *fe,
drivers/media/dvb-frontends/lnbp21.h +3 -2
@@ -27,6 +27,8 @@#ifndef _LNBP21_H#define _LNBP21_H +#include <linux/kconfig.h> +/* system register bits */ /* [RO] 0=OK; 1=over current limit flag */ #define LNBP21_OLF 0x01
@@ -55,8 +57,7 @@#include <linux/dvb/frontend.h> -#if defined(CONFIG_DVB_LNBP21 ) || (defined(CONFIG_DVB_LNBP21_MODULE ) \ - && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_LNBP21 )/* override_set and override_clear control which system register bits (above) to always set & clear */ extern struct dvb_frontend *lnbp21_attach(struct dvb_frontend *fe,
drivers/media/dvb-frontends/lnbp22.h +3 -2
@@ -28,6 +28,8 @@#ifndef _LNBP22_H#define _LNBP22_H +#include <linux/kconfig.h> +/* Enable */ #define LNBP22_EN 0x10/* Voltage selection */
@@ -37,8 +39,7 @@#include <linux/dvb/frontend.h> -#if defined(CONFIG_DVB_LNBP22 ) || \ - (defined(CONFIG_DVB_LNBP22_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_LNBP22 )/* * override_set and override_clear control which system register bits (above) * to always set & clear
drivers/media/dvb-frontends/m88rs2000.h +2 -2
@@ -20,6 +20,7 @@#ifndef M88RS2000_H #define M88RS2000_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> #include "dvb_frontend.h"
@@ -40,8 +41,7 @@ enum { CALL_IS_READ, }; -#if defined(CONFIG_DVB_M88RS2000 ) || (defined(CONFIG_DVB_M88RS2000_MODULE ) && \ - defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_M88RS2000 )extern struct dvb_frontend *m88rs2000_attach (const struct m88rs2000_config *config,struct i2c_adapter *i2c);#else
drivers/media/dvb-frontends/mb86a20s.h +2 -2
@@ -16,6 +16,7 @@#ifndef MB86A20S_H #define MB86A20S_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> /**
@@ -33,8 +34,7 @@ struct mb86a20s_config {bool is_serial; }; -#if defined(CONFIG_DVB_MB86A20S ) || (defined(CONFIG_DVB_MB86A20S_MODULE ) \ - && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_MB86A20S )extern struct dvb_frontend *mb86a20s_attach (const struct mb86a20s_config *config,struct i2c_adapter *i2c);extern struct i2c_adapter *mb86a20s_get_tuner_i2c_adapter (struct dvb_frontend *);
drivers/media/dvb-frontends/rtl2830.h +2 -2
@@ -21,6 +21,7 @@#ifndef RTL2830_H #define RTL2830_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> struct rtl2830_config {
@@ -59,8 +60,7 @@ struct rtl2830_config {u8 agc_targ_val; }; -#if defined(CONFIG_DVB_RTL2830 ) || \ - (defined(CONFIG_DVB_RTL2830_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_RTL2830 )extern struct dvb_frontend *rtl2830_attach (const struct rtl2830_config *config, struct i2c_adapter *i2c
drivers/media/dvb-frontends/rtl2832.h +2 -2
@@ -21,6 +21,7 @@#ifndef RTL2832_H #define RTL2832_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> struct rtl2832_config {
@@ -54,8 +55,7 @@ struct rtl2832_config {u8 tuner; }; -#if defined(CONFIG_DVB_RTL2832 ) || \ - (defined(CONFIG_DVB_RTL2832_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_RTL2832 )extern struct dvb_frontend *rtl2832_attach (const struct rtl2832_config *cfg, struct i2c_adapter *i2c
drivers/media/dvb-frontends/s5h1409.h +2 -2
@@ -22,6 +22,7 @@#ifndef __S5H1409_H__#define __S5H1409_H__ +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> struct s5h1409_config {
@@ -66,8 +67,7 @@ struct s5h1409_config {u8 hvr1600_opt; }; -#if defined(CONFIG_DVB_S5H1409 ) || (defined(CONFIG_DVB_S5H1409_MODULE ) \ - && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_S5H1409 )extern struct dvb_frontend *s5h1409_attach (const struct s5h1409_config *config,struct i2c_adapter *i2c);#else
drivers/media/dvb-frontends/s5h1411.h +2 -2
@@ -22,6 +22,7 @@#ifndef __S5H1411_H__#define __S5H1411_H__ +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> #define S5H1411_I2C_TOP_ADDR (0x32 >> 1)
@@ -68,8 +69,7 @@ struct s5h1411_config {u8 status_mode; }; -#if defined(CONFIG_DVB_S5H1411 ) || \ - (defined(CONFIG_DVB_S5H1411_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_S5H1411 )extern struct dvb_frontend *s5h1411_attach (const struct s5h1411_config *config,struct i2c_adapter *i2c);#else
drivers/media/dvb-frontends/s5h1432.h +2 -2
@@ -22,6 +22,7 @@#ifndef __S5H1432_H__#define __S5H1432_H__ +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> #define S5H1432_I2C_TOP_ADDR (0x02 >> 1)
@@ -74,8 +75,7 @@ struct s5h1432_config {u8 status_mode; }; -#if defined(CONFIG_DVB_S5H1432 ) || \ - (defined(CONFIG_DVB_S5H1432_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_S5H1432 )extern struct dvb_frontend *s5h1432_attach (const struct s5h1432_config *config,struct i2c_adapter *i2c);#else
drivers/media/dvb-frontends/s921.h +2 -2
@@ -17,6 +17,7 @@#ifndef S921_H #define S921_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> struct s921_config {
@@ -24,8 +25,7 @@ struct s921_config {u8 demod_address; }; -#if defined(CONFIG_DVB_S921 ) || (defined(CONFIG_DVB_S921_MODULE ) \ - && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_S921 )extern struct dvb_frontend *s921_attach (const struct s921_config *config,struct i2c_adapter *i2c);extern struct i2c_adapter *s921_get_tuner_i2c_adapter (struct dvb_frontend *);
drivers/media/dvb-frontends/si21xx.h +2 -2
@@ -1,6 +1,7 @@#ifndef SI21XX_H #define SI21XX_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> #include "dvb_frontend.h"
@@ -12,8 +13,7 @@ struct si21xx_config {int min_delay_ms; }; -#if defined(CONFIG_DVB_SI21XX ) || \ - (defined(CONFIG_DVB_SI21XX_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_SI21XX )extern struct dvb_frontend *si21xx_attach (const struct si21xx_config *config,struct i2c_adapter *i2c);#else
drivers/media/dvb-frontends/stb6000.h +2 -2
@@ -23,6 +23,7 @@#ifndef __DVB_STB6000_H__#define __DVB_STB6000_H__ +#include <linux/kconfig.h> #include <linux/i2c.h> #include "dvb_frontend.h"
@@ -34,8 +35,7 @@* @param i2c i2c adapter to use. * @return FE pointer on success, NULL on failure. */ -#if defined(CONFIG_DVB_STB6000 ) || (defined(CONFIG_DVB_STB6000_MODULE ) \ - && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_STB6000 )extern struct dvb_frontend *stb6000_attach (struct dvb_frontend *fe,int addr,struct i2c_adapter *i2c);#else
drivers/media/dvb-frontends/stv0288.h +2 -2
@@ -27,6 +27,7 @@#ifndef STV0288_H #define STV0288_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> #include "dvb_frontend.h"
@@ -42,8 +43,7 @@ struct stv0288_config {int (*set_ts_params)(struct dvb_frontend *fe,int is_punctured); }; -#if defined(CONFIG_DVB_STV0288 ) || (defined(CONFIG_DVB_STV0288_MODULE ) && \ - defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_STV0288 )extern struct dvb_frontend *stv0288_attach (const struct stv0288_config *config,struct i2c_adapter *i2c);#else
drivers/media/dvb-frontends/stv0367.h +2 -2
@@ -26,6 +26,7 @@#ifndef STV0367_H #define STV0367_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> #include "dvb_frontend.h"
@@ -38,8 +39,7 @@ struct stv0367_config {int clk_pol; }; -#if defined(CONFIG_DVB_STV0367 ) || (defined(CONFIG_DVB_STV0367_MODULE ) \ - && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_STV0367 )extern struct dvb_frontend *stv0367ter_attach (const struct stv0367_config *config,struct i2c_adapter *i2c);
drivers/media/dvb-frontends/stv0900.h +2 -2
@@ -26,6 +26,7 @@#ifndef STV0900_H #define STV0900_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> #include "dvb_frontend.h"
@@ -57,8 +58,7 @@ struct stv0900_config {void (*set_lock_led)(struct dvb_frontend *fe,int offon); }; -#if defined(CONFIG_DVB_STV0900 ) || (defined(CONFIG_DVB_STV0900_MODULE ) \ - && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_STV0900 )extern struct dvb_frontend *stv0900_attach (const struct stv0900_config *config,struct i2c_adapter *i2c,int demod);#else
drivers/media/dvb-frontends/stv6110.h +2 -2
@@ -25,6 +25,7 @@#ifndef __DVB_STV6110_H__#define __DVB_STV6110_H__ +#include <linux/kconfig.h> #include <linux/i2c.h> #include "dvb_frontend.h"
@@ -45,8 +46,7 @@ struct stv6110_config {u8 clk_div;/* divisor value for the output clock */ }; -#if defined(CONFIG_DVB_STV6110 ) || (defined(CONFIG_DVB_STV6110_MODULE ) \ - && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_STV6110 )extern struct dvb_frontend *stv6110_attach (struct dvb_frontend *fe,const struct stv6110_config *config,struct i2c_adapter *i2c);
drivers/media/dvb-frontends/tda10048.h +2 -2
@@ -22,6 +22,7 @@#ifndef TDA10048_H #define TDA10048_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> #include <linux/firmware.h>
@@ -72,8 +73,7 @@ struct tda10048_config {u8 pll_n; }; -#if defined(CONFIG_DVB_TDA10048 ) || \ - (defined(CONFIG_DVB_TDA10048_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_TDA10048 )extern struct dvb_frontend *tda10048_attach (const struct tda10048_config *config,struct i2c_adapter *i2c);
drivers/media/dvb-frontends/tda10071.h +2 -2
@@ -21,6 +21,7 @@#ifndef TDA10071_H #define TDA10071_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> struct tda10071_config {
@@ -71,8 +72,7 @@ struct tda10071_config { }; -#if defined(CONFIG_DVB_TDA10071 ) || \ - (defined(CONFIG_DVB_TDA10071_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_TDA10071 )extern struct dvb_frontend *tda10071_attach (const struct tda10071_config *config,struct i2c_adapter *i2c);#else
drivers/media/dvb-frontends/tda18271c2dd.h +4 -2
@@ -1,7 +1,9 @@#ifndef _TDA18271C2DD_H_#define _TDA18271C2DD_H_ -#if defined(CONFIG_DVB_TDA18271C2DD ) || (defined(CONFIG_DVB_TDA18271C2DD_MODULE ) \ - && defined(MODULE )) + +#include <linux/kconfig.h> + +#if IS_ENABLED (CONFIG_DVB_TDA18271C2DD )struct dvb_frontend *tda18271c2dd_attach (struct dvb_frontend *fe,struct i2c_adapter *i2c,u8 adr);#else
drivers/media/dvb-frontends/ts2020.h +2 -2
@@ -22,6 +22,7 @@#ifndef TS2020_H #define TS2020_H +#include <linux/kconfig.h> #include <linux/dvb/frontend.h> struct ts2020_config {
@@ -29,8 +30,7 @@ struct ts2020_config {u8 clk_out_div; }; -#if defined(CONFIG_DVB_TS2020 ) || \ - (defined(CONFIG_DVB_TS2020_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_TS2020 ) extern struct dvb_frontend *ts2020_attach( struct dvb_frontend *fe,
drivers/media/dvb-frontends/zl10036.h +2 -2
@@ -21,6 +21,7 @@#ifndef DVB_ZL10036_H #define DVB_ZL10036_H +#include <linux/kconfig.h> #include <linux/i2c.h> #include "dvb_frontend.h"
@@ -37,8 +38,7 @@ struct zl10036_config {int rf_loop_enable; }; -#if defined(CONFIG_DVB_ZL10036 ) || \ - (defined(CONFIG_DVB_ZL10036_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_ZL10036 )extern struct dvb_frontend *zl10036_attach (struct dvb_frontend *fe,const struct zl10036_config *config,struct i2c_adapter *i2c);#else
drivers/media/dvb-frontends/zl10039.h +3 -2
@@ -22,8 +22,9 @@#ifndef ZL10039_H #define ZL10039_H -#if defined(CONFIG_DVB_ZL10039 ) || (defined(CONFIG_DVB_ZL10039_MODULE ) \ - && defined(MODULE )) +#include <linux/kconfig.h> + +#if IS_ENABLED (CONFIG_DVB_ZL10039 )struct dvb_frontend *zl10039_attach (struct dvb_frontend *fe,u8 i2c_addr,struct i2c_adapter *i2c);
Signature · 1 line
1.8.1.4
PATCH v2 2/4 tuners: use IS_ENABLED
Instead of checking everywhere there for 3 symbols, use instead IS_ENABLED macro.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
--- drivers/media/tuners/e4000.h | 4 ++-- drivers/media/tuners/fc0011.h | 4 ++-- drivers/media/tuners/fc0012.h | 4 ++-- drivers/media/tuners/fc0013.h | 4 ++-- drivers/media/tuners/fc2580.h | 4 ++-- drivers/media/tuners/max2165.h | 5 +++-- drivers/media/tuners/mc44s803.h | 5 +++-- drivers/media/tuners/mxl5005s.h | 5 +++-- drivers/media/tuners/tda18212.h | 4 ++-- drivers/media/tuners/tda18218.h | 4 ++-- drivers/media/tuners/tua9001.h | 4 ++-- drivers/media/tuners/xc5000.h | 4 ++-- 12 files changed, 27 insertions(+), 24 deletions(-)
drivers/media/tuners/e4000.h +2 -2
@@ -21,6 +21,7 @@#ifndef E4000_H #define E4000_H +#include <linux/kconfig.h> #include "dvb_frontend.h" struct e4000_config {
@@ -36,8 +37,7 @@ struct e4000_config {u32 clock; }; -#if defined(CONFIG_MEDIA_TUNER_E4000 ) || \ - (defined(CONFIG_MEDIA_TUNER_E4000_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_MEDIA_TUNER_E4000 )extern struct dvb_frontend *e4000_attach (struct dvb_frontend *fe,struct i2c_adapter *i2c,const struct e4000_config *cfg);#else
drivers/media/tuners/fc0011.h +2 -2
@@ -1,6 +1,7 @@#ifndef LINUX_FC0011_H_ #define LINUX_FC0011_H_ +#include <linux/kconfig.h> #include "dvb_frontend.h"
@@ -22,8 +23,7 @@ enum fc0011_fe_callback_commands { FC0011_FE_CALLBACK_RESET, }; -#if defined(CONFIG_MEDIA_TUNER_FC0011 ) ||\ - defined(CONFIG_MEDIA_TUNER_FC0011_MODULE ) +#if IS_ENABLED (CONFIG_MEDIA_TUNER_FC0011 )struct dvb_frontend *fc0011_attach (struct dvb_frontend *fe,struct i2c_adapter *i2c,const struct fc0011_config *config);
drivers/media/tuners/fc0012.h +2 -2
@@ -21,6 +21,7 @@#ifndef _FC0012_H_#define _FC0012_H_ +#include <linux/kconfig.h> #include "dvb_frontend.h" #include "fc001x-common.h"
@@ -48,8 +49,7 @@ struct fc0012_config {bool clock_out; }; -#if defined(CONFIG_MEDIA_TUNER_FC0012 ) || \ - (defined(CONFIG_MEDIA_TUNER_FC0012_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_MEDIA_TUNER_FC0012 )extern struct dvb_frontend *fc0012_attach (struct dvb_frontend *fe,struct i2c_adapter *i2c,const struct fc0012_config *cfg);
drivers/media/tuners/fc0013.h +2 -2
@@ -22,11 +22,11 @@#ifndef _FC0013_H_#define _FC0013_H_ +#include <linux/kconfig.h> #include "dvb_frontend.h" #include "fc001x-common.h" -#if defined(CONFIG_MEDIA_TUNER_FC0013 ) || \ - (defined(CONFIG_MEDIA_TUNER_FC0013_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_MEDIA_TUNER_FC0013 ) extern struct dvb_frontend *fc0013_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 i2c_address, int dual_master,
drivers/media/tuners/fc2580.h +2 -2
@@ -21,6 +21,7 @@#ifndef FC2580_H #define FC2580_H +#include <linux/kconfig.h> #include "dvb_frontend.h" struct fc2580_config {
@@ -36,8 +37,7 @@ struct fc2580_config {u32 clock; }; -#if defined(CONFIG_MEDIA_TUNER_FC2580 ) || \ - (defined(CONFIG_MEDIA_TUNER_FC2580_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_MEDIA_TUNER_FC2580 )extern struct dvb_frontend *fc2580_attach (struct dvb_frontend *fe,struct i2c_adapter *i2c,const struct fc2580_config *cfg);#else
drivers/media/tuners/max2165.h +3 -2
@@ -22,6 +22,8 @@#ifndef __MAX2165_H__#define __MAX2165_H__ +#include <linux/kconfig.h> +struct dvb_frontend ;struct i2c_adapter ;
@@ -30,8 +32,7 @@ struct max2165_config {u8 osc_clk;/* in MHz, selectable values: 4,16,18,20,22,24,26,28 */ }; -#if defined(CONFIG_MEDIA_TUNER_MAX2165 ) || \ - (defined(CONFIG_MEDIA_TUNER_MAX2165_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_MEDIA_TUNER_MAX2165 )extern struct dvb_frontend *max2165_attach (struct dvb_frontend *fe,struct i2c_adapter *i2c,struct max2165_config *cfg);
drivers/media/tuners/mc44s803.h +3 -2
@@ -22,6 +22,8 @@#ifndef MC44S803_H #define MC44S803_H +#include <linux/kconfig.h> +struct dvb_frontend ;struct i2c_adapter ;
@@ -30,8 +32,7 @@ struct mc44s803_config {u8 dig_out; }; -#if defined(CONFIG_MEDIA_TUNER_MC44S803 ) || \ - (defined(CONFIG_MEDIA_TUNER_MC44S803_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_MEDIA_TUNER_MC44S803 )extern struct dvb_frontend *mc44s803_attach (struct dvb_frontend *fe,struct i2c_adapter *i2c,struct mc44s803_config *cfg);#else
drivers/media/tuners/mxl5005s.h +3 -2
@@ -23,6 +23,8 @@#ifndef __MXL5005S_H#define __MXL5005S_H +#include <linux/kconfig.h> +#include <linux/i2c.h> #include "dvb_frontend.h"
@@ -116,8 +118,7 @@ struct mxl5005s_config {u8 AgcMasterByte; }; -#if defined(CONFIG_MEDIA_TUNER_MXL5005S ) || \ - (defined(CONFIG_MEDIA_TUNER_MXL5005S_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_MEDIA_TUNER_MXL5005S )extern struct dvb_frontend *mxl5005s_attach (struct dvb_frontend *fe,struct i2c_adapter *i2c,struct mxl5005s_config *config);
drivers/media/tuners/tda18212.h +2 -2
@@ -21,6 +21,7 @@#ifndef TDA18212_H #define TDA18212_H +#include <linux/kconfig.h> #include "dvb_frontend.h" struct tda18212_config {
@@ -36,8 +37,7 @@ struct tda18212_config {u16 if_dvbc; }; -#if defined(CONFIG_MEDIA_TUNER_TDA18212 ) || \ - (defined(CONFIG_MEDIA_TUNER_TDA18212_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_MEDIA_TUNER_TDA18212 )extern struct dvb_frontend *tda18212_attach (struct dvb_frontend *fe,struct i2c_adapter *i2c,struct tda18212_config *cfg);#else
drivers/media/tuners/tda18218.h +2 -2
@@ -21,6 +21,7 @@#ifndef TDA18218_H #define TDA18218_H +#include <linux/kconfig.h> #include "dvb_frontend.h" struct tda18218_config {
@@ -29,8 +30,7 @@ struct tda18218_config { u8 loop_through:1; }; -#if defined(CONFIG_MEDIA_TUNER_TDA18218 ) || \ - (defined(CONFIG_MEDIA_TUNER_TDA18218_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_MEDIA_TUNER_TDA18218 )extern struct dvb_frontend *tda18218_attach (struct dvb_frontend *fe,struct i2c_adapter *i2c,struct tda18218_config *cfg);#else
drivers/media/tuners/tua9001.h +2 -2
@@ -21,6 +21,7 @@#ifndef TUA9001_H #define TUA9001_H +#include <linux/kconfig.h> #include "dvb_frontend.h" struct tua9001_config {
@@ -50,8 +51,7 @@ struct tua9001_config {#define TUA9001_CMD_RESETN 1#define TUA9001_CMD_RXEN 2 -#if defined(CONFIG_MEDIA_TUNER_TUA9001 ) || \ - (defined(CONFIG_MEDIA_TUNER_TUA9001_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_MEDIA_TUNER_TUA9001 )extern struct dvb_frontend *tua9001_attach (struct dvb_frontend *fe,struct i2c_adapter *i2c,struct tua9001_config *cfg);#else
drivers/media/tuners/xc5000.h +2 -2
@@ -22,6 +22,7 @@#ifndef __XC5000_H__#define __XC5000_H__ +#include <linux/kconfig.h> #include <linux/firmware.h> struct dvb_frontend ;
@@ -56,8 +57,7 @@ struct xc5000_config {* it's passed back to a bridge during tuner_callback(). */ -#if defined(CONFIG_MEDIA_TUNER_XC5000 ) || \ - (defined(CONFIG_MEDIA_TUNER_XC5000_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_MEDIA_TUNER_XC5000 )extern struct dvb_frontend *xc5000_attach (struct dvb_frontend *fe,struct i2c_adapter *i2c,const struct xc5000_config *cfg);
Signature · 1 line
1.8.1.4
PATCH v2 3/4 cx23885: use IS_ENABLED
In reply to Mauro Carvalho ChehabInstead of checking everywhere there for 3 symbols, use instead IS_ENABLED macro.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
--- drivers/media/pci/cx23885/altera-ci.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/pci/cx23885/altera-ci.h +3 -2
@@ -24,6 +24,8 @@#ifndef __ALTERA_CI_H#define __ALTERA_CI_H +#include <linux/kconfig.h> +#define ALT_DATA 0x000000ff#define ALT_TDI 0x00008000#define ALT_TDO 0x00004000
@@ -41,8 +43,7 @@ struct altera_ci_config {int (*fpga_rw) (void *dev,int ad_rg,int val,int rw); }; -#if defined(CONFIG_MEDIA_ALTERA_CI ) || (defined(CONFIG_MEDIA_ALTERA_CI_MODULE ) \ - && defined(MODULE )) +#if IS_ENABLED (CONFIG_MEDIA_ALTERA_CI )extern int altera_ci_init (struct altera_ci_config *config,int ci_nr);extern void altera_ci_release (void *dev,int ci_nr);
Signature · 1 line
1.8.1.4
PATCH v2 4/4 dvb-usb/dvb-usb-v2: use IS_ENABLED
In reply to Mauro Carvalho ChehabInstead of checking everywhere there for 3 symbols, use instead IS_ENABLED macro.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
--- drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h | 4 ++-- drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h | 5 ++--- drivers/media/usb/dvb-usb/dibusb-common.c | 5 +++-- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h +2 -2
@@ -21,6 +21,7 @@#ifndef __MXL111SF_DEMOD_H__#define __MXL111SF_DEMOD_H__ +#include <linux/kconfig.h> #include "dvb_frontend.h" #include "mxl111sf.h"
@@ -31,8 +32,7 @@ struct mxl111sf_demod_config { struct mxl111sf_reg_ctrl_info *ctrl_reg_info); }; -#if defined(CONFIG_DVB_USB_MXL111SF ) || \ - (defined(CONFIG_DVB_USB_MXL111SF_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_USB_MXL111SF )extern struct dvb_frontend *mxl111sf_demod_attach (struct mxl111sf_state *mxl_state,struct mxl111sf_demod_config *cfg);
drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h +2 -3
@@ -21,8 +21,8 @@#ifndef __MXL111SF_TUNER_H__#define __MXL111SF_TUNER_H__ +#include <linux/kconfig.h> #include "dvb_frontend.h" -#include "mxl111sf.h" enum mxl_if_freq {
@@ -60,8 +60,7 @@ struct mxl111sf_tuner_config {/* ------------------------------------------------------------------------ */ -#if defined(CONFIG_DVB_USB_MXL111SF ) || \ - (defined(CONFIG_DVB_USB_MXL111SF_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_USB_MXL111SF )extern struct dvb_frontend *mxl111sf_tuner_attach(struct dvb_frontend *fe, struct mxl111sf_state *mxl_state,
drivers/media/usb/dvb-usb/dibusb-common.c +3 -2
@@ -8,6 +8,8 @@* * see Documentation/dvb/README.dvb-usb for more information */ + +#include <linux/kconfig.h> #include "dibusb.h" static int debug;
@@ -232,8 +234,7 @@ static struct dibx000_agc_config dib3000p_panasonic_agc_config = { .agc2_slope2 = 0x1e, }; -#if defined(CONFIG_DVB_DIB3000MC ) || \ - (defined(CONFIG_DVB_DIB3000MC_MODULE ) && defined(MODULE )) +#if IS_ENABLED (CONFIG_DVB_DIB3000MC )static struct dib3000mc_config mod3000p_dib3000p_config = { &dib3000p_panasonic_agc_config,
Signature · 1 line
1.8.1.4