[media] m88ds3103: convert to use an explicit i2c mux core

Allocate an explicit i2c mux core to handle parent and child adapters
etc. Update the select op to be in terms of the i2c mux core instead
of the child adapter.

Tested-by: Antti Palosaari <crope@iki.fi>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c
index 7688360..5557ef8 100644 (file)
--- a/drivers/media/dvb-frontends/m88ds3103.c
+++ b/drivers/media/dvb-frontends/m88ds3103.c
@@ -1251,9 +1251,9 @@ static void m88ds3103_release(struct dvb_frontend *fe)
        i2c_unregister_device(client);
 }
 
-static int m88ds3103_select(struct i2c_adapter *adap, void *mux_priv, u32 chan)
+static int m88ds3103_select(struct i2c_mux_core *muxc, u32 chan)
 {
-       struct m88ds3103_dev *dev = mux_priv;
+       struct m88ds3103_dev *dev = i2c_mux_priv(muxc);
        struct i2c_client *client = dev->client;
        int ret;
        struct i2c_msg msg = {
@@ -1374,7 +1374,7 @@ static struct i2c_adapter *m88ds3103_get_i2c_adapter(struct i2c_client *client)
 
        dev_dbg(&client->dev, "\n");
 
-       return dev->i2c_adapter;
+       return dev->muxc->adapter[0];
 }
 
 static int m88ds3103_probe(struct i2c_client *client,
@@ -1467,13 +1467,16 @@ static int m88ds3103_probe(struct i2c_client *client,
                goto err_kfree;
 
        /* create mux i2c adapter for tuner */
-       dev->i2c_adapter = i2c_add_mux_adapter(client->adapter, &client->dev,
-                                              dev, 0, 0, 0, m88ds3103_select,
-                                              NULL);
-       if (dev->i2c_adapter == NULL) {
+       dev->muxc = i2c_mux_alloc(client->adapter, &client->dev, 1, 0, 0,
+                                 m88ds3103_select, NULL);
+       if (!dev->muxc) {
                ret = -ENOMEM;
                goto err_kfree;
        }
+       dev->muxc->priv = dev;
+       ret = i2c_mux_add_adapter(dev->muxc, 0, 0, 0);
+       if (ret)
+               goto err_kfree;
 
        /* create dvb_frontend */
        memcpy(&dev->fe.ops, &m88ds3103_ops, sizeof(struct dvb_frontend_ops));
@@ -1502,7 +1505,7 @@ static int m88ds3103_remove(struct i2c_client *client)
 
        dev_dbg(&client->dev, "\n");
 
-       i2c_del_mux_adapter(dev->i2c_adapter);
+       i2c_mux_del_adapters(dev->muxc);
 
        kfree(dev);
        return 0;

diff --git a/drivers/media/dvb-frontends/m88ds3103_priv.h b/drivers/media/dvb-frontends/m88ds3103_priv.h
index eee8c22..c5b4e17 100644 (file)
--- a/drivers/media/dvb-frontends/m88ds3103_priv.h
+++ b/drivers/media/dvb-frontends/m88ds3103_priv.h
@@ -42,7 +42,7 @@ struct m88ds3103_dev {
        enum fe_status fe_status;
        u32 dvbv3_ber; /* for old DVBv3 API read_ber */
        bool warm; /* FW running */
-       struct i2c_adapter *i2c_adapter;
+       struct i2c_mux_core *muxc;
        /* auto detect chip id to do different config */
        u8 chip_id;
        /* main mclk is calculated for M88RS6000 dynamically */