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

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

[media] rtl28xxu: rename tuner I2C client pointer 



Better to rename tuner I2C to something which clearly says it is
for tuner as there is now multiple different I2C clients used.

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent fc694e44

drivers/media/usb/dvb-usb-v2/rtl28xxu.c

+3 −3
Original line number Diff line number Diff line
@@ -1078,7 +1078,7 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap) 
				break;

			}



			priv->client = client;

			priv->i2c_client_tuner = client;

			sd = i2c_get_clientdata(client);

			i2c_set_adapdata(i2c_adap_internal, d);
@@ -1137,7 +1137,7 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap) 
				priv->tuner);

	}



	if (fe == NULL && priv->client == NULL) {

	if (fe == NULL && priv->i2c_client_tuner == NULL) {

		ret = -ENODEV;

		goto err;

	}
@@ -1190,7 +1190,7 @@ static void rtl28xxu_exit(struct dvb_usb_device *d) 
	dev_dbg(&d->udev->dev, "%s:\n", __func__);



	/* remove I2C tuner */

	client = priv->client;

	client = priv->i2c_client_tuner;

	if (client) {

		module_put(client->dev.driver->owner);

		i2c_unregister_device(client);

drivers/media/usb/dvb-usb-v2/rtl28xxu.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct rtl28xxu_priv { 
	u8 page; /* integrated demod active register page */

	struct i2c_adapter *demod_i2c_adapter;

	bool rc_active;

	struct i2c_client *client;

	struct i2c_client *i2c_client_tuner;

	struct i2c_client *i2c_client_slave_demod;

	#define SLAVE_DEMOD_NONE           0

	#define SLAVE_DEMOD_MN88472        1