diff options
Diffstat (limited to 'drivers/media/dvb-frontends')
| -rw-r--r-- | drivers/media/dvb-frontends/cxd2841er.c | 3 | ||||
| -rw-r--r-- | drivers/media/dvb-frontends/drx39xyj/drxj.c | 2 | ||||
| -rw-r--r-- | drivers/media/dvb-frontends/drxk_hard.c | 3 | ||||
| -rw-r--r-- | drivers/media/dvb-frontends/lgdt330x.c | 4 | ||||
| -rw-r--r-- | drivers/media/dvb-frontends/mn88443x.c | 7 |
5 files changed, 9 insertions, 10 deletions
diff --git a/drivers/media/dvb-frontends/cxd2841er.c b/drivers/media/dvb-frontends/cxd2841er.c index 415f1f91cc30..8fcb4417ba22 100644 --- a/drivers/media/dvb-frontends/cxd2841er.c +++ b/drivers/media/dvb-frontends/cxd2841er.c @@ -1936,7 +1936,8 @@ static void cxd2841er_read_ber(struct dvb_frontend *fe) { struct dtv_frontend_properties *p = &fe->dtv_property_cache; struct cxd2841er_priv *priv = fe->demodulator_priv; - u32 ret, bit_error = 0, bit_count = 0; + u32 bit_error = 0, bit_count = 0; + int ret; dev_dbg(&priv->i2c->dev, "%s()\n", __func__); switch (p->delivery_system) { diff --git a/drivers/media/dvb-frontends/drx39xyj/drxj.c b/drivers/media/dvb-frontends/drx39xyj/drxj.c index 779cce93e94a..428b31e60874 100644 --- a/drivers/media/dvb-frontends/drx39xyj/drxj.c +++ b/drivers/media/dvb-frontends/drx39xyj/drxj.c @@ -1270,7 +1270,7 @@ static const u16 nicam_presc_table_val[43] = { TODO: check ignoring single/multimaster is ok for AUD access ? */ -#define DRXJ_ISAUDWRITE(addr) (((((addr)>>16)&1) == 1) ? true : false) +#define DRXJ_ISAUDWRITE(addr) ((((addr) >> 16) & 1) == 1) #define DRXJ_DAP_AUDTRIF_TIMEOUT 80 /* millisec */ /*============================================================================*/ diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c index 87f3d4f0eb8c..9ef367918824 100644 --- a/drivers/media/dvb-frontends/drxk_hard.c +++ b/drivers/media/dvb-frontends/drxk_hard.c @@ -6324,8 +6324,7 @@ static int drxk_set_parameters(struct dvb_frontend *fe) case SYS_DVBC_ANNEX_C: if (!state->m_has_dvbc) return -EINVAL; - state->m_itut_annex_c = (delsys == SYS_DVBC_ANNEX_C) ? - true : false; + state->m_itut_annex_c = delsys == SYS_DVBC_ANNEX_C; if (state->m_itut_annex_c) setoperation_mode(state, OM_QAM_ITU_C); else diff --git a/drivers/media/dvb-frontends/lgdt330x.c b/drivers/media/dvb-frontends/lgdt330x.c index cab442a350a5..8c34a5b850bc 100644 --- a/drivers/media/dvb-frontends/lgdt330x.c +++ b/drivers/media/dvb-frontends/lgdt330x.c @@ -124,7 +124,6 @@ static int i2c_read_demod_bytes(struct lgdt330x_state *state, /* Software reset */ static int lgdt3302_sw_reset(struct lgdt330x_state *state) { - u8 ret; u8 reset[] = { IRQ_MASK, /* @@ -133,6 +132,7 @@ static int lgdt3302_sw_reset(struct lgdt330x_state *state) */ 0x00 }; + int ret; ret = i2c_write_demod_bytes(state, reset, sizeof(reset)); @@ -147,11 +147,11 @@ static int lgdt3302_sw_reset(struct lgdt330x_state *state) static int lgdt3303_sw_reset(struct lgdt330x_state *state) { - u8 ret; u8 reset[] = { 0x02, 0x00 /* bit 0 is active low software reset */ }; + int ret; ret = i2c_write_demod_bytes(state, reset, sizeof(reset)); diff --git a/drivers/media/dvb-frontends/mn88443x.c b/drivers/media/dvb-frontends/mn88443x.c index 7a58f53ab999..818c4e67364c 100644 --- a/drivers/media/dvb-frontends/mn88443x.c +++ b/drivers/media/dvb-frontends/mn88443x.c @@ -694,8 +694,7 @@ static int mn88443x_probe(struct i2c_client *client) chip->mclk = devm_clk_get(dev, "mclk"); if (IS_ERR(chip->mclk) && !conf) { - dev_err(dev, "Failed to request mclk: %ld\n", - PTR_ERR(chip->mclk)); + dev_err(dev, "Failed to request mclk: %pe\n", chip->mclk); return PTR_ERR(chip->mclk); } @@ -709,8 +708,8 @@ static int mn88443x_probe(struct i2c_client *client) chip->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); if (IS_ERR(chip->reset_gpio)) { - dev_err(dev, "Failed to request reset_gpio: %ld\n", - PTR_ERR(chip->reset_gpio)); + dev_err(dev, "Failed to request reset_gpio: %pe\n", + chip->reset_gpio); return PTR_ERR(chip->reset_gpio); } |