[media] m88ds3103: calculate DiSEqC message sending time

[deliverable/linux.git] / drivers / media / dvb-frontends / m88ds3103.c

diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c
index 76883600ec6f08de70a49298aa289a82fef3b95d..6f03ca8b25da058451558b943ee10199c8382b3f 100644 (file)
--- a/drivers/media/dvb-frontends/m88ds3103.c
+++ b/drivers/media/dvb-frontends/m88ds3103.c
@@ -605,9 +605,6 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
 
        s32tmp = 0x10000 * (tuner_frequency - c->frequency);
        s32tmp = DIV_ROUND_CLOSEST(s32tmp, dev->mclk_khz);
-       if (s32tmp < 0)
-               s32tmp += 0x10000;
-
        buf[0] = (s32tmp >> 0) & 0xff;
        buf[1] = (s32tmp >> 8) & 0xff;
        ret = regmap_bulk_write(dev->regmap, 0x5e, buf, 2);
@@ -1119,8 +1116,9 @@ static int m88ds3103_diseqc_send_master_cmd(struct dvb_frontend *fe,
        #define SEND_MASTER_CMD_TIMEOUT 120
        timeout = jiffies + msecs_to_jiffies(SEND_MASTER_CMD_TIMEOUT);
 
-       /* DiSEqC message typical period is 54 ms */
-       usleep_range(50000, 54000);
+       /* DiSEqC message period is 13.5 ms per byte */
+       utmp = diseqc_cmd->msg_len * 13500;
+       usleep_range(utmp - 4000, utmp);
 
        for (utmp = 1; !time_after(jiffies, timeout) && utmp;) {
                ret = regmap_read(dev->regmap, 0xa1, &utmp);
@@ -1251,9 +1249,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 +1372,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 +1465,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 +1503,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;