[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: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
index cb54d2a4c60be3cdc5dda81892985b40718baba6..a527330d1ee1a17f6aa0ec944ff1b0253ee9f64b 100644 (file)
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
@@ -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);

diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.h b/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
index 7f959ff7451fe80fcab9206ad3da19b6b9a1288d..3e3ea9d64a38e8a818ad4230cfc589a2711d62b5 100644 (file)
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
@@ -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