Skip to content

L
linux
Commit 8f4ffb1d authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files
Options

[media] anysee: fix style issues 

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4048da2f
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 21 deletions
drivers/media/dvb/dvb-usb/anysee.c
View file @ 8f4ffb1d
...@@ -631,7 +631,8 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap) ...@@ -631,7 +631,8 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
/* detect hardware only once */ /* detect hardware only once */
if (adap->fe_adap[0].fe == NULL) { if (adap->fe_adap[0].fe == NULL) {
/* Check which hardware we have. /* Check which hardware we have.
* We must do this call two times to get reliable values (hw bug). * We must do this call two times to get reliable values
* (hw/fw bug).
*/ */
ret = anysee_get_hw_info(adap->dev, hw_info); ret = anysee_get_hw_info(adap->dev, hw_info);
if (ret) if (ret)
...@@ -660,14 +661,14 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap) ...@@ -660,14 +661,14 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
break; break;
/* attach demod */ /* attach demod */
adap->fe_adap[0].fe = dvb_attach(mt352_attach, &anysee_mt352_config, adap->fe_adap[0].fe = dvb_attach(mt352_attach,
&adap->dev->i2c_adap); &anysee_mt352_config, &adap->dev->i2c_adap);
if (adap->fe_adap[0].fe) if (adap->fe_adap[0].fe)
break; break;
/* attach demod */ /* attach demod */
adap->fe_adap[0].fe = dvb_attach(zl10353_attach, &anysee_zl10353_config, adap->fe_adap[0].fe = dvb_attach(zl10353_attach,
&adap->dev->i2c_adap); &anysee_zl10353_config, &adap->dev->i2c_adap);
break; break;
case ANYSEE_HW_507CD: /* 6 */ case ANYSEE_HW_507CD: /* 6 */
...@@ -719,8 +720,8 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap) ...@@ -719,8 +720,8 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
goto error; goto error;
/* attach demod */ /* attach demod */
adap->fe_adap[0].fe = dvb_attach(cx24116_attach, &anysee_cx24116_config, adap->fe_adap[0].fe = dvb_attach(cx24116_attach,
&adap->dev->i2c_adap); &anysee_cx24116_config, &adap->dev->i2c_adap);
break; break;
case ANYSEE_HW_507FA: /* 15 */ case ANYSEE_HW_507FA: /* 15 */
...@@ -828,7 +829,8 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap) ...@@ -828,7 +829,8 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
goto error; goto error;
/* attach demod */ /* attach demod */
adap->fe_adap[state->fe_id].fe = dvb_attach(tda10023_attach, adap->fe_adap[state->fe_id].fe =
dvb_attach(tda10023_attach,
&anysee_tda10023_tda18212_config, &anysee_tda10023_tda18212_config,
&adap->dev->i2c_adap, 0x48); &adap->dev->i2c_adap, 0x48);
} else { } else {
...@@ -845,7 +847,8 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap) ...@@ -845,7 +847,8 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
goto error; goto error;
/* attach demod */ /* attach demod */
adap->fe_adap[state->fe_id].fe = dvb_attach(zl10353_attach, adap->fe_adap[state->fe_id].fe =
dvb_attach(zl10353_attach,
&anysee_zl10353_tda18212_config, &anysee_zl10353_tda18212_config,
&adap->dev->i2c_adap); &adap->dev->i2c_adap);
} }
...@@ -872,8 +875,8 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap) ...@@ -872,8 +875,8 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
goto error; goto error;
/* attach demod */ /* attach demod */
adap->fe_adap[0].fe = dvb_attach(stv0900_attach, &anysee_stv0900_config, adap->fe_adap[0].fe = dvb_attach(stv0900_attach,
&adap->dev->i2c_adap, 0); &anysee_stv0900_config, &adap->dev->i2c_adap, 0);
state->has_ci = true; state->has_ci = true;
...@@ -888,12 +891,14 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap) ...@@ -888,12 +891,14 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
if (state->fe_id == 0) { if (state->fe_id == 0) {
/* DVB-T/T2 */ /* DVB-T/T2 */
adap->fe_adap[state->fe_id].fe = dvb_attach(cxd2820r_attach, adap->fe_adap[state->fe_id].fe =
dvb_attach(cxd2820r_attach,
&anysee_cxd2820r_config, &anysee_cxd2820r_config,
&adap->dev->i2c_adap, NULL); &adap->dev->i2c_adap, NULL);
} else { } else {
/* DVB-C */ /* DVB-C */
adap->fe_adap[state->fe_id].fe = dvb_attach(cxd2820r_attach, adap->fe_adap[state->fe_id].fe =
dvb_attach(cxd2820r_attach,
&anysee_cxd2820r_config, &anysee_cxd2820r_config,
&adap->dev->i2c_adap, adap->fe_adap[0].fe); &adap->dev->i2c_adap, adap->fe_adap[0].fe);
} }
...@@ -925,24 +930,26 @@ static int anysee_tuner_attach(struct dvb_usb_adapter *adap) ...@@ -925,24 +930,26 @@ static int anysee_tuner_attach(struct dvb_usb_adapter *adap)
/* E30 */ /* E30 */
/* attach tuner */ /* attach tuner */
fe = dvb_attach(dvb_pll_attach, adap->fe_adap[0].fe, (0xc2 >> 1), fe = dvb_attach(dvb_pll_attach, adap->fe_adap[0].fe,
NULL, DVB_PLL_THOMSON_DTT7579); (0xc2 >> 1), NULL, DVB_PLL_THOMSON_DTT7579);
break; break;
case ANYSEE_HW_507CD: /* 6 */ case ANYSEE_HW_507CD: /* 6 */
/* E30 Plus */ /* E30 Plus */
/* attach tuner */ /* attach tuner */
fe = dvb_attach(dvb_pll_attach, adap->fe_adap[0].fe, (0xc2 >> 1), fe = dvb_attach(dvb_pll_attach, adap->fe_adap[0].fe,
&adap->dev->i2c_adap, DVB_PLL_THOMSON_DTT7579); (0xc2 >> 1), &adap->dev->i2c_adap,
DVB_PLL_THOMSON_DTT7579);
break; break;
case ANYSEE_HW_507DC: /* 10 */ case ANYSEE_HW_507DC: /* 10 */
/* E30 C Plus */ /* E30 C Plus */
/* attach tuner */ /* attach tuner */
fe = dvb_attach(dvb_pll_attach, adap->fe_adap[0].fe, (0xc0 >> 1), fe = dvb_attach(dvb_pll_attach, adap->fe_adap[0].fe,
&adap->dev->i2c_adap, DVB_PLL_SAMSUNG_DTOS403IH102A); (0xc0 >> 1), &adap->dev->i2c_adap,
DVB_PLL_SAMSUNG_DTOS403IH102A);
break; break;
case ANYSEE_HW_507SI: /* 11 */ case ANYSEE_HW_507SI: /* 11 */
...@@ -1310,7 +1317,7 @@ static struct dvb_usb_device_properties anysee_properties = { ...@@ -1310,7 +1317,7 @@ static struct dvb_usb_device_properties anysee_properties = {
{ {
.num_frontends = 2, .num_frontends = 2,
.frontend_ctrl = anysee_frontend_ctrl, .frontend_ctrl = anysee_frontend_ctrl,
.fe = {{ .fe = { {
.streaming_ctrl = anysee_streaming_ctrl, .streaming_ctrl = anysee_streaming_ctrl,
.frontend_attach = anysee_frontend_attach, .frontend_attach = anysee_frontend_attach,
.tuner_attach = anysee_tuner_attach, .tuner_attach = anysee_tuner_attach,
...@@ -1338,7 +1345,7 @@ static struct dvb_usb_device_properties anysee_properties = { ...@@ -1338,7 +1345,7 @@ static struct dvb_usb_device_properties anysee_properties = {
} }
} }
}, },
}}, } },
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7