From: Antti Palosaari Date: Mon, 7 May 2012 17:59:55 +0000 (-0300) Subject: [media] af9035: remove one config parameter X-Git-Tag: firefly_0821_release~3680^2~275^2~2284 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1cbabf9c751f8795a35885fad9ceaec7de71a29e;p=firefly-linux-kernel-4.4.55.git [media] af9035: remove one config parameter We can use tuner ID instead of HW not supported flag. Lesser code is better code. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/dvb/dvb-usb/af9035.c b/drivers/media/dvb/dvb-usb/af9035.c index d2c84ee290a8..d97f45e39f4f 100644 --- a/drivers/media/dvb/dvb-usb/af9035.c +++ b/drivers/media/dvb/dvb-usb/af9035.c @@ -615,7 +615,6 @@ static int af9035_read_mac_address(struct dvb_usb_device *d, u8 mac[6]) state->af9033_config[i].spec_inv = 1; break; default: - state->hw_not_supported = true; warn("tuner ID=%02x not supported, please report!", tmp); }; @@ -809,7 +808,8 @@ static int af9035_frontend_attach(struct dvb_usb_adapter *adap) struct state *state = adap->dev->priv; int ret; - if (state->hw_not_supported) { + if (!state->af9033_config[adap->id].tuner) { + /* unsupported tuner */ ret = -ENODEV; goto err; } diff --git a/drivers/media/dvb/dvb-usb/af9035.h b/drivers/media/dvb/dvb-usb/af9035.h index 262cc3f4b008..481a1a43dd2a 100644 --- a/drivers/media/dvb/dvb-usb/af9035.h +++ b/drivers/media/dvb/dvb-usb/af9035.h @@ -54,7 +54,6 @@ struct usb_req { struct state { bool dual_mode; - bool hw_not_supported; struct af9033_config af9033_config[2]; };