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

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

[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

drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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,