[media] tda10071: coding style issues

[firefly-linux-kernel-4.4.55.git] / drivers / media / dvb-frontends / tda10071.c

diff --git a/drivers/media/dvb-frontends/tda10071.c b/drivers/media/dvb-frontends/tda10071.c
index a76df29c497359f9b3f275d4f98a8a4f38f2213e..522fe00f5eee167f6fa59a657aaad1b4dce55783 100644 (file)
--- a/drivers/media/dvb-frontends/tda10071.c
+++ b/drivers/media/dvb-frontends/tda10071.c
@@ -42,8 +42,8 @@ static int tda10071_wr_regs(struct tda10071_priv *priv, u8 reg, u8 *val,
 
        if (1 + len > sizeof(buf)) {
                dev_warn(&priv->i2c->dev,
-                        "%s: i2c wr reg=%04x: len=%d is too big!\n",
-                        KBUILD_MODNAME, reg, len);
+                               "%s: i2c wr reg=%04x: len=%d is too big!\n",
+                               KBUILD_MODNAME, reg, len);
                return -EINVAL;
        }
 
@@ -54,8 +54,9 @@ static int tda10071_wr_regs(struct tda10071_priv *priv, u8 reg, u8 *val,
        if (ret == 1) {
                ret = 0;
        } else {
-               dev_warn(&priv->i2c->dev, "%s: i2c wr failed=%d reg=%02x " \
-                               "len=%d\n", KBUILD_MODNAME, ret, reg, len);
+               dev_warn(&priv->i2c->dev,
+                               "%s: i2c wr failed=%d reg=%02x len=%d\n",
+                               KBUILD_MODNAME, ret, reg, len);
                ret = -EREMOTEIO;
        }
        return ret;
@@ -83,8 +84,8 @@ static int tda10071_rd_regs(struct tda10071_priv *priv, u8 reg, u8 *val,
 
        if (len > sizeof(buf)) {
                dev_warn(&priv->i2c->dev,
-                        "%s: i2c wr reg=%04x: len=%d is too big!\n",
-                        KBUILD_MODNAME, reg, len);
+                               "%s: i2c wr reg=%04x: len=%d is too big!\n",
+                               KBUILD_MODNAME, reg, len);
                return -EINVAL;
        }
 
@@ -93,8 +94,9 @@ static int tda10071_rd_regs(struct tda10071_priv *priv, u8 reg, u8 *val,
                memcpy(val, buf, len);
                ret = 0;
        } else {
-               dev_warn(&priv->i2c->dev, "%s: i2c rd failed=%d reg=%02x " \
-                               "len=%d\n", KBUILD_MODNAME, ret, reg, len);
+               dev_warn(&priv->i2c->dev,
+                               "%s: i2c rd failed=%d reg=%02x len=%d\n",
+                               KBUILD_MODNAME, ret, reg, len);
                ret = -EREMOTEIO;
        }
        return ret;
@@ -491,10 +493,9 @@ static int tda10071_read_status(struct dvb_frontend *fe, fe_status_t *status)
        if (ret)
                goto error;
 
-       if (tmp & 0x01) /* tuner PLL */
-               *status |= FE_HAS_SIGNAL;
+       /* 0x39[0] tuner PLL */
        if (tmp & 0x02) /* demod PLL */
-               *status |= FE_HAS_CARRIER;
+               *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER;
        if (tmp & 0x04) /* viterbi or LDPC*/
                *status |= FE_HAS_VITERBI;
        if (tmp & 0x08) /* RS or BCH */
@@ -668,11 +669,11 @@ static int tda10071_set_frontend(struct dvb_frontend *fe)
        int ret, i;
        u8 mode, rolloff, pilot, inversion, div;
 
-       dev_dbg(&priv->i2c->dev, "%s: delivery_system=%d modulation=%d " \
-               "frequency=%d symbol_rate=%d inversion=%d pilot=%d " \
-               "rolloff=%d\n", __func__, c->delivery_system, c->modulation,
-               c->frequency, c->symbol_rate, c->inversion, c->pilot,
-               c->rolloff);
+       dev_dbg(&priv->i2c->dev,
+                       "%s: delivery_system=%d modulation=%d frequency=%d symbol_rate=%d inversion=%d pilot=%d rolloff=%d\n",
+                       __func__, c->delivery_system, c->modulation,
+                       c->frequency, c->symbol_rate, c->inversion, c->pilot,
+                       c->rolloff);
 
        priv->delivery_system = SYS_UNDEFINED;
 
@@ -952,10 +953,8 @@ static int tda10071_init(struct dvb_frontend *fe)
                /* request the firmware, this will block and timeout */
                ret = request_firmware(&fw, fw_file, priv->i2c->dev.parent);
                if (ret) {
-                       dev_err(&priv->i2c->dev, "%s: did not find the " \
-                                       "firmware file. (%s) Please see " \
-                                       "linux/Documentation/dvb/ for more " \
-                                       "details on firmware-problems. (%d)\n",
+                       dev_err(&priv->i2c->dev,
+                                       "%s: did not find the firmware file. (%s) Please see linux/Documentation/dvb/ for more details on firmware-problems. (%d)\n",
                                        KBUILD_MODNAME, fw_file, ret);
                        goto error;
                }
@@ -985,11 +984,12 @@ static int tda10071_init(struct dvb_frontend *fe)
                if (ret)
                        goto error_release_firmware;
 
-               dev_info(&priv->i2c->dev, "%s: found a '%s' in cold state, " \
-                               "will try to load a firmware\n", KBUILD_MODNAME,
-                               tda10071_ops.info.name);
-               dev_info(&priv->i2c->dev, "%s: downloading firmware from " \
-                               "file '%s'\n", KBUILD_MODNAME, fw_file);
+               dev_info(&priv->i2c->dev,
+                               "%s: found a '%s' in cold state, will try to load a firmware\n",
+                               KBUILD_MODNAME, tda10071_ops.info.name);
+               dev_info(&priv->i2c->dev,
+                               "%s: downloading firmware from file '%s'\n",
+                               KBUILD_MODNAME, fw_file);
 
                /* do not download last byte */
                fw_size = fw->size - 1;
@@ -1003,8 +1003,8 @@ static int tda10071_init(struct dvb_frontend *fe)
                        ret = tda10071_wr_regs(priv, 0xfa,
                                (u8 *) &fw->data[fw_size - remaining], len);
                        if (ret) {
-                               dev_err(&priv->i2c->dev, "%s: firmware " \
-                                               "download failed=%d\n",
+                               dev_err(&priv->i2c->dev,
+                                               "%s: firmware download failed=%d\n",
                                                KBUILD_MODNAME, ret);
                                goto error_release_firmware;
                        }
@@ -1068,12 +1068,17 @@ static int tda10071_init(struct dvb_frontend *fe)
                if (ret)
                        goto error;
 
+               if (priv->cfg.tuner_i2c_addr)
+                       tmp = priv->cfg.tuner_i2c_addr;
+               else
+                       tmp = 0x14;
+
                cmd.args[0] = CMD_TUNER_INIT;
                cmd.args[1] = 0x00;
                cmd.args[2] = 0x00;
                cmd.args[3] = 0x00;
                cmd.args[4] = 0x00;
-               cmd.args[5] = (priv->cfg.tuner_i2c_addr) ? priv->cfg.tuner_i2c_addr : 0x14;
+               cmd.args[5] = tmp;
                cmd.args[6] = 0x00;
                cmd.args[7] = 0x03;
                cmd.args[8] = 0x02;
@@ -1213,14 +1218,14 @@ struct dvb_frontend *tda10071_attach(const struct tda10071_config *config,
 
        /* make sure demod i2c address is specified */
        if (!config->demod_i2c_addr) {
-               dev_dbg(&i2c->dev, "%s: invalid demod i2c address!\n", __func__);
+               dev_dbg(&i2c->dev, "%s: invalid demod i2c address\n", __func__);
                ret = -EINVAL;
                goto error;
        }
 
        /* make sure tuner i2c address is specified */
        if (!config->tuner_i2c_addr) {
-               dev_dbg(&i2c->dev, "%s: invalid tuner i2c address!\n", __func__);
+               dev_dbg(&i2c->dev, "%s: invalid tuner i2c address\n", __func__);
                ret = -EINVAL;
                goto error;
        }