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

[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

drivers/media/dvb/dvb-usb/anysee.c

+28 −21
Original line number Diff line number Diff line
@@ -631,7 +631,8 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap) 
	/* detect hardware only once */

	if (adap->fe_adap[0].fe == NULL) {

		/* 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);

		if (ret)
@@ -660,14 +661,14 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap) 
			break;



		/* attach demod */

		adap->fe_adap[0].fe = dvb_attach(mt352_attach, &anysee_mt352_config,

			&adap->dev->i2c_adap);

		adap->fe_adap[0].fe = dvb_attach(mt352_attach,

			&anysee_mt352_config, &adap->dev->i2c_adap);

		if (adap->fe_adap[0].fe)

			break;



		/* attach demod */

		adap->fe_adap[0].fe = dvb_attach(zl10353_attach, &anysee_zl10353_config,

			&adap->dev->i2c_adap);

		adap->fe_adap[0].fe = dvb_attach(zl10353_attach,

			&anysee_zl10353_config, &adap->dev->i2c_adap);



		break;

	case ANYSEE_HW_507CD: /* 6 */
@@ -719,8 +720,8 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap) 
			goto error;



		/* attach demod */

		adap->fe_adap[0].fe = dvb_attach(cx24116_attach, &anysee_cx24116_config,

			&adap->dev->i2c_adap);

		adap->fe_adap[0].fe = dvb_attach(cx24116_attach,

			&anysee_cx24116_config, &adap->dev->i2c_adap);



		break;

	case ANYSEE_HW_507FA: /* 15 */
@@ -828,7 +829,8 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap) 
				goto error;



			/* 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,

				&adap->dev->i2c_adap, 0x48);

		} else {
@@ -845,7 +847,8 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap) 
				goto error;



			/* 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,

				&adap->dev->i2c_adap);

		}
@@ -872,8 +875,8 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap) 
			goto error;



		/* attach demod */

		adap->fe_adap[0].fe = dvb_attach(stv0900_attach, &anysee_stv0900_config,

			&adap->dev->i2c_adap, 0);

		adap->fe_adap[0].fe = dvb_attach(stv0900_attach,

			&anysee_stv0900_config, &adap->dev->i2c_adap, 0);



		state->has_ci = true;
@@ -888,12 +891,14 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap) 


		if (state->fe_id == 0)  {

			/* 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,

				&adap->dev->i2c_adap, NULL);

		} else {

			/* 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,

				&adap->dev->i2c_adap, adap->fe_adap[0].fe);

		}
@@ -925,24 +930,26 @@ static int anysee_tuner_attach(struct dvb_usb_adapter *adap) 
		/* E30 */



		/* attach tuner */

		fe = dvb_attach(dvb_pll_attach, adap->fe_adap[0].fe, (0xc2 >> 1),

			NULL, DVB_PLL_THOMSON_DTT7579);

		fe = dvb_attach(dvb_pll_attach, adap->fe_adap[0].fe,

			(0xc2 >> 1), NULL, DVB_PLL_THOMSON_DTT7579);



		break;

	case ANYSEE_HW_507CD: /* 6 */

		/* E30 Plus */



		/* attach tuner */

		fe = dvb_attach(dvb_pll_attach, adap->fe_adap[0].fe, (0xc2 >> 1),

			&adap->dev->i2c_adap, DVB_PLL_THOMSON_DTT7579);

		fe = dvb_attach(dvb_pll_attach, adap->fe_adap[0].fe,

			(0xc2 >> 1), &adap->dev->i2c_adap,

			DVB_PLL_THOMSON_DTT7579);



		break;

	case ANYSEE_HW_507DC: /* 10 */

		/* E30 C Plus */



		/* attach tuner */

		fe = dvb_attach(dvb_pll_attach, adap->fe_adap[0].fe, (0xc0 >> 1),

			&adap->dev->i2c_adap, DVB_PLL_SAMSUNG_DTOS403IH102A);

		fe = dvb_attach(dvb_pll_attach, adap->fe_adap[0].fe,

			(0xc0 >> 1), &adap->dev->i2c_adap,

			DVB_PLL_SAMSUNG_DTOS403IH102A);



		break;

	case ANYSEE_HW_507SI: /* 11 */