Skip to contentSkip to conversation

media: usb: dib0700_devices.c: remove useless if/else

PATCH In review Daniel W. S. Almeida 1 participant 1 message Aug 7, 2020 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 12/20 media: usb: dib0700_devices.c: remove useless if/else

From: "Daniel W. S. Almeida" <[email protected]>

Fix the following coccinelle report:

drivers/media/usb/dvb-usb/dib0700_devices.c:1741:1-3:
WARNING: possible condition with no effect (if == else)

Both branches are the same, so remove the if/else altogether.

Found using - Coccinelle (http://coccinelle.lip6.fr)

---
 drivers/media/usb/dvb-usb/dib0700_devices.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/media/usb/dvb-usb/dib0700_devices.c +3 -8
index 4ef3fa98d20f..f027db979c90 100644
@@ -1738,14 +1738,9 @@ static int dib809x_tuner_attach(struct dvb_usb_adapter *adap)
 	struct dib0700_adapter_state *st = adap->priv;
 	struct i2c_adapter *tun_i2c = st->dib8000_ops.get_i2c_master(adap->fe_adap[0].fe, DIBX000_I2C_INTERFACE_TUNER, 1);
 
-	if (adap->id == 0) {
-		if (dvb_attach(dib0090_register, adap->fe_adap[0].fe, tun_i2c, &dib809x_dib0090_config) == NULL)
-			return -ENODEV;
-	} else {
-		/* FIXME: check if it is fe_adap[1] */
-		if (dvb_attach(dib0090_register, adap->fe_adap[0].fe, tun_i2c, &dib809x_dib0090_config) == NULL)
-			return -ENODEV;
-	}
+	/* FIXME: if adap->id != 0, check if it is fe_adap[1] */
+	if (dvb_attach(dib0090_register, adap->fe_adap[0].fe, tun_i2c, &dib809x_dib0090_config) == NULL)
+		return -ENODEV;
 
 	st->set_param_save = adap->fe_adap[0].fe->ops.tuner_ops.set_params;
 	adap->fe_adap[0].fe->ops.tuner_ops.set_params = dib8096_set_param_override;
Signature · 1 line
2.28.0