[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>
This commit is contained in:
committed by
Mauro Carvalho Chehab
parent
ffe4db06fd
commit
7b34be71db
@@ -265,7 +265,7 @@ static struct mb86a16_config twinhan_vp1027 = {
|
||||
.demod_address = 0x08,
|
||||
};
|
||||
|
||||
#if defined(CONFIG_VIDEO_CX88_VP3054) || (defined(CONFIG_VIDEO_CX88_VP3054_MODULE) && defined(MODULE))
|
||||
#if IS_ENABLED(CONFIG_VIDEO_CX88_VP3054)
|
||||
static int dntv_live_dvbt_pro_demod_init(struct dvb_frontend* fe)
|
||||
{
|
||||
static const u8 clock_config [] = { 0x89, 0x38, 0x38 };
|
||||
@@ -1127,7 +1127,7 @@ static int dvb_register(struct cx8802_dev *dev)
|
||||
}
|
||||
break;
|
||||
case CX88_BOARD_DNTV_LIVE_DVB_T_PRO:
|
||||
#if defined(CONFIG_VIDEO_CX88_VP3054) || (defined(CONFIG_VIDEO_CX88_VP3054_MODULE) && defined(MODULE))
|
||||
#if IS_ENABLED(CONFIG_VIDEO_CX88_VP3054)
|
||||
/* MT352 is on a secondary I2C bus made from some GPIO lines */
|
||||
fe0->dvb.frontend = dvb_attach(mt352_attach, &dntv_live_dvbt_pro_config,
|
||||
&dev->vp3054->adap);
|
||||
|
||||
@@ -30,7 +30,7 @@ struct vp3054_i2c_state {
|
||||
};
|
||||
|
||||
/* ----------------------------------------------------------------------- */
|
||||
#if defined(CONFIG_VIDEO_CX88_VP3054) || (defined(CONFIG_VIDEO_CX88_VP3054_MODULE) && defined(MODULE))
|
||||
#if IS_ENABLED(CONFIG_VIDEO_CX88_VP3054)
|
||||
int vp3054_i2c_probe(struct cx8802_dev *dev);
|
||||
void vp3054_i2c_remove(struct cx8802_dev *dev);
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user