Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[media] m88ts2022: change parameter type of m88ts2022_cmd 



It is driver internal function and does not need anything from
frontend structure. Due to that change parameter type to driver
state which is better for driver internal functions.

Also remove one unused variable from state itself.

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 35c77a85

drivers/media/tuners/m88ts2022.c

+10 −11
Original line number Diff line number Diff line
@@ -18,10 +18,9 @@ 


#include "m88ts2022_priv.h"



static int m88ts2022_cmd(struct dvb_frontend *fe,

		int op, int sleep, u8 reg, u8 mask, u8 val, u8 *reg_val)

static int m88ts2022_cmd(struct m88ts2022_dev *dev, int op, int sleep, u8 reg,

		u8 mask, u8 val, u8 *reg_val)

{

	struct m88ts2022_dev *dev = fe->tuner_priv;

	int ret, i;

	unsigned int utmp;

	struct m88ts2022_reg_val reg_vals[] = {
@@ -124,7 +123,7 @@ static int m88ts2022_set_params(struct dvb_frontend *fe) 
			dev->frequency_khz, dev->frequency_khz - c->frequency,

			f_vco_khz, pll_n, div_ref, div_out);



	ret = m88ts2022_cmd(fe, 0x10, 5, 0x15, 0x40, 0x00, NULL);

	ret = m88ts2022_cmd(dev, 0x10, 5, 0x15, 0x40, 0x00, NULL);

	if (ret)

		goto err;
@@ -142,7 +141,7 @@ static int m88ts2022_set_params(struct dvb_frontend *fe) 
		if (ret)

			goto err;



		ret = m88ts2022_cmd(fe, 0x10, 5, 0x15, 0x40, 0x00, NULL);

		ret = m88ts2022_cmd(dev, 0x10, 5, 0x15, 0x40, 0x00, NULL);

		if (ret)

			goto err;

	}
@@ -158,7 +157,7 @@ static int m88ts2022_set_params(struct dvb_frontend *fe) 
			goto err;

	}



	ret = m88ts2022_cmd(fe, 0x08, 5, 0x3c, 0xff, 0x00, NULL);

	ret = m88ts2022_cmd(dev, 0x08, 5, 0x3c, 0xff, 0x00, NULL);

	if (ret)

		goto err;
@@ -185,7 +184,7 @@ static int m88ts2022_set_params(struct dvb_frontend *fe) 
	if (ret)

		goto err;



	ret = m88ts2022_cmd(fe, 0x04, 2, 0x26, 0xff, 0x00, &u8tmp);

	ret = m88ts2022_cmd(dev, 0x04, 2, 0x26, 0xff, 0x00, &u8tmp);

	if (ret)

		goto err;
@@ -195,7 +194,7 @@ static int m88ts2022_set_params(struct dvb_frontend *fe) 
	if (ret)

		goto err;



	ret = m88ts2022_cmd(fe, 0x04, 2, 0x26, 0xff, 0x00, &u8tmp);

	ret = m88ts2022_cmd(dev, 0x04, 2, 0x26, 0xff, 0x00, &u8tmp);

	if (ret)

		goto err;
@@ -227,7 +226,7 @@ static int m88ts2022_set_params(struct dvb_frontend *fe) 
	if (ret)

		goto err;



	ret = m88ts2022_cmd(fe, 0x04, 2, 0x26, 0xff, 0x00, &u8tmp);

	ret = m88ts2022_cmd(dev, 0x04, 2, 0x26, 0xff, 0x00, &u8tmp);

	if (ret)

		goto err;
@@ -237,7 +236,7 @@ static int m88ts2022_set_params(struct dvb_frontend *fe) 
	if (ret)

		goto err;



	ret = m88ts2022_cmd(fe, 0x04, 2, 0x26, 0xff, 0x00, &u8tmp);

	ret = m88ts2022_cmd(dev, 0x04, 2, 0x26, 0xff, 0x00, &u8tmp);

	if (ret)

		goto err;
@@ -257,7 +256,7 @@ static int m88ts2022_set_params(struct dvb_frontend *fe) 
	if (ret)

		goto err;



	ret = m88ts2022_cmd(fe, 0x01, 20, 0x21, 0xff, 0x00, NULL);

	ret = m88ts2022_cmd(dev, 0x01, 20, 0x21, 0xff, 0x00, NULL);

	if (ret)

		goto err;

err:

drivers/media/tuners/m88ts2022_priv.h

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ struct m88ts2022_dev { 
	struct m88ts2022_config cfg;

	struct i2c_client *client;

	struct regmap *regmap;

	struct dvb_frontend *fe;

	u32 frequency_khz;

};