[media] cx23885: add i2c client handling into dvb_unregister and state

Prepare cx23885 driver for handling I2C client that is needed for certain demodulators and tuners (for example Si2168 and Si2157). I2C client for tuner and demod stored in state and unregistering of the I2C devices added into dvb_unregister.

Signed-off-by: Olli Salonen <olli.salonen@iki.fi>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

2 files changed, 19 insertions, 7 deletions

diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index 332e6facc095..3e72c95a1d59 100644
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -1688,15 +1688,24 @@ int cx23885_dvb_register(struct cx23885_tsport *port)
 int cx23885_dvb_unregister(struct cx23885_tsport *port)
 {
         struct vb2_dvb_frontend *fe0;
+        struct i2c_client *client;
+
+        /* remove I2C client for tuner */
+        client = port->i2c_client_tuner;
+        if (client) {
+                module_put(client->dev.driver->owner);
+                i2c_unregister_device(client);
+        }
+
+        /* remove I2C client for demodulator */
+        client = port->i2c_client_demod;
+        if (client) {
+                module_put(client->dev.driver->owner);
+                i2c_unregister_device(client);
+        }
 
-        /* FIXME: in an error condition where the we have
-         * an expected number of frontends (attach problem)
-         * then this might not clean up correctly, if 1
-         * is invalid.
-         * This comment only applies to future boards IF they
-         * implement MFE support.
-         */
         fe0 = vb2_dvb_get_frontend(&port->frontends, 1);
+
         if (fe0 && fe0->dvb.frontend)
                 vb2_dvb_unregister_bus(&port->frontends);
 
diff --git a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23885.h
index 39a89855d1d5..458d180cf96d 100644
--- a/drivers/media/pci/cx23885/cx23885.h
+++ b/drivers/media/pci/cx23885/cx23885.h
@@ -293,6 +293,9 @@ struct cx23885_tsport {
         /* Workaround for a temp dvb_frontend that the tuner can attached to */
         struct dvb_frontend analog_fe;
 
+        struct i2c_client *i2c_client_demod;
+        struct i2c_client *i2c_client_tuner;
+
         int (*set_frontend)(struct dvb_frontend *fe);
 };