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

[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
...@@ -1078,7 +1078,7 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap) ...@@ -1078,7 +1078,7 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap)
break; break;
} }
priv->client = client; priv->i2c_client_tuner = client;
sd = i2c_get_clientdata(client); sd = i2c_get_clientdata(client);
i2c_set_adapdata(i2c_adap_internal, d); i2c_set_adapdata(i2c_adap_internal, d);
...@@ -1137,7 +1137,7 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap) ...@@ -1137,7 +1137,7 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap)
priv->tuner); priv->tuner);
} }
if (fe == NULL && priv->client == NULL) { if (fe == NULL && priv->i2c_client_tuner == NULL) {
ret = -ENODEV; ret = -ENODEV;
goto err; goto err;
} }
...@@ -1190,7 +1190,7 @@ static void rtl28xxu_exit(struct dvb_usb_device *d) ...@@ -1190,7 +1190,7 @@ static void rtl28xxu_exit(struct dvb_usb_device *d)
dev_dbg(&d->udev->dev, "%s:\n", __func__); dev_dbg(&d->udev->dev, "%s:\n", __func__);
/* remove I2C tuner */ /* remove I2C tuner */
client = priv->client; client = priv->i2c_client_tuner;
if (client) { if (client) {
module_put(client->dev.driver->owner); module_put(client->dev.driver->owner);
i2c_unregister_device(client); i2c_unregister_device(client);
......
...@@ -57,7 +57,7 @@ struct rtl28xxu_priv { ...@@ -57,7 +57,7 @@ struct rtl28xxu_priv {
u8 page; /* integrated demod active register page */ u8 page; /* integrated demod active register page */
struct i2c_adapter *demod_i2c_adapter; struct i2c_adapter *demod_i2c_adapter;
bool rc_active; bool rc_active;
struct i2c_client *client; struct i2c_client *i2c_client_tuner;
struct i2c_client *i2c_client_slave_demod; struct i2c_client *i2c_client_slave_demod;
#define SLAVE_DEMOD_NONE 0 #define SLAVE_DEMOD_NONE 0
#define SLAVE_DEMOD_MN88472 1 #define SLAVE_DEMOD_MN88472 1
......
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