Commit 028c70ff authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[media] dvb-usb/dvb-usb-v2: use IS_ENABLED

Instead of checking everywhere there for 3 symbols, use instead
IS_ENABLED macro.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1c59390b
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#ifndef __MXL111SF_DEMOD_H__ #ifndef __MXL111SF_DEMOD_H__
#define __MXL111SF_DEMOD_H__ #define __MXL111SF_DEMOD_H__
#include <linux/kconfig.h>
#include "dvb_frontend.h" #include "dvb_frontend.h"
#include "mxl111sf.h" #include "mxl111sf.h"
...@@ -31,8 +32,7 @@ struct mxl111sf_demod_config { ...@@ -31,8 +32,7 @@ struct mxl111sf_demod_config {
struct mxl111sf_reg_ctrl_info *ctrl_reg_info); struct mxl111sf_reg_ctrl_info *ctrl_reg_info);
}; };
#if defined(CONFIG_DVB_USB_MXL111SF) || \ #if IS_ENABLED(CONFIG_DVB_USB_MXL111SF)
(defined(CONFIG_DVB_USB_MXL111SF_MODULE) && defined(MODULE))
extern extern
struct dvb_frontend *mxl111sf_demod_attach(struct mxl111sf_state *mxl_state, struct dvb_frontend *mxl111sf_demod_attach(struct mxl111sf_state *mxl_state,
struct mxl111sf_demod_config *cfg); struct mxl111sf_demod_config *cfg);
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#ifndef __MXL111SF_TUNER_H__ #ifndef __MXL111SF_TUNER_H__
#define __MXL111SF_TUNER_H__ #define __MXL111SF_TUNER_H__
#include <linux/kconfig.h>
#include "dvb_frontend.h" #include "dvb_frontend.h"
#include "mxl111sf.h" #include "mxl111sf.h"
enum mxl_if_freq { enum mxl_if_freq {
...@@ -60,8 +60,7 @@ struct mxl111sf_tuner_config { ...@@ -60,8 +60,7 @@ struct mxl111sf_tuner_config {
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */
#if defined(CONFIG_DVB_USB_MXL111SF) || \ #if IS_ENABLED(CONFIG_DVB_USB_MXL111SF)
(defined(CONFIG_DVB_USB_MXL111SF_MODULE) && defined(MODULE))
extern extern
struct dvb_frontend *mxl111sf_tuner_attach(struct dvb_frontend *fe, struct dvb_frontend *mxl111sf_tuner_attach(struct dvb_frontend *fe,
struct mxl111sf_state *mxl_state, struct mxl111sf_state *mxl_state,
......
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
* *
* see Documentation/dvb/README.dvb-usb for more information * see Documentation/dvb/README.dvb-usb for more information
*/ */
#include <linux/kconfig.h>
#include "dibusb.h" #include "dibusb.h"
static int debug; static int debug;
...@@ -232,8 +234,7 @@ static struct dibx000_agc_config dib3000p_panasonic_agc_config = { ...@@ -232,8 +234,7 @@ static struct dibx000_agc_config dib3000p_panasonic_agc_config = {
.agc2_slope2 = 0x1e, .agc2_slope2 = 0x1e,
}; };
#if defined(CONFIG_DVB_DIB3000MC) || \ #if IS_ENABLED(CONFIG_DVB_DIB3000MC)
(defined(CONFIG_DVB_DIB3000MC_MODULE) && defined(MODULE))
static struct dib3000mc_config mod3000p_dib3000p_config = { static struct dib3000mc_config mod3000p_dib3000p_config = {
&dib3000p_panasonic_agc_config, &dib3000p_panasonic_agc_config,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment