[media] dvb-frontends/cxd2841er: immediately unfreeze regs when done

Do unfreeze_regs() directly when accessing the demod registers is done,
and don't have multiple unfreeze's on different conditions, which even
can get prone to errors.

Signed-off-by: Daniel Scheller <d.scheller@gmx.net>
Acked-by: Abylay Ospan <aospan@netup.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/dvb-frontends/cxd2841er.c b/drivers/media/dvb-frontends/cxd2841er.c
index 575d08ad2be3d423d30cb8371f0d4b0ffa20ac12..7d6b82eaeebf32e0027c9592e8a79793b9aadd61 100644 (file)
--- a/drivers/media/dvb-frontends/cxd2841er.c
+++ b/drivers/media/dvb-frontends/cxd2841er.c
@@ -1410,11 +1410,11 @@ static int cxd2841er_read_ber_i(struct cxd2841er_priv *priv,
        cxd2841er_write_reg(priv, I2C_SLVT, 0x00, 0x60);
        cxd2841er_read_regs(priv, I2C_SLVT, 0x5B, pktnum, sizeof(pktnum));
        cxd2841er_read_regs(priv, I2C_SLVT, 0x16, data, sizeof(data));
+       cxd2841er_unfreeze_regs(priv);
 
        if (!pktnum[0] && !pktnum[1]) {
                dev_dbg(&priv->i2c->dev,
                                "%s(): no valid BER data\n", __func__);
-               cxd2841er_unfreeze_regs(priv);
                return -EINVAL;
        }
 
@@ -1424,7 +1424,6 @@ static int cxd2841er_read_ber_i(struct cxd2841er_priv *priv,
        dev_dbg(&priv->i2c->dev, "%s(): bit_error=%u bit_count=%u\n",
                        __func__, *bit_error, *bit_count);
 
-       cxd2841er_unfreeze_regs(priv);
        return 0;
 }
 
@@ -1634,6 +1633,8 @@ static u32 cxd2841er_dvbs_read_snr(struct cxd2841er_priv *priv,
         * <SLV-T>    A1h       12h       [7:0]   ICPM_QUICKCNDT[7:0]
         */
        cxd2841er_read_regs(priv, I2C_SLVT, 0x10, data, 3);
+       cxd2841er_unfreeze_regs(priv);
+
        if (data[0] & 0x01) {
                value = ((u32)(data[1] & 0x1F) << 8) | (u32)(data[2] & 0xFF);
                min_index = 0;
@@ -1676,11 +1677,9 @@ static u32 cxd2841er_dvbs_read_snr(struct cxd2841er_priv *priv,
        } else {
                dev_dbg(&priv->i2c->dev,
                        "%s(): no data available\n", __func__);
-               cxd2841er_unfreeze_regs(priv);
                return -EINVAL;
        }
 done:
-       cxd2841er_unfreeze_regs(priv);
        *snr = res;
        return 0;
 }
@@ -1709,12 +1708,12 @@ static int cxd2841er_read_snr_c(struct cxd2841er_priv *priv, u32 *snr)
        cxd2841er_read_regs(priv, I2C_SLVT, 0x19, data, 1);
        qam = (enum sony_dvbc_constellation_t) (data[0] & 0x07);
        cxd2841er_read_regs(priv, I2C_SLVT, 0x4C, data, 2);
+       cxd2841er_unfreeze_regs(priv);
 
        reg = ((u32)(data[0]&0x1f) << 8) | (u32)data[1];
        if (reg == 0) {
                dev_dbg(&priv->i2c->dev,
                                "%s(): reg value out of range\n", __func__);
-               cxd2841er_unfreeze_regs(priv);
                return 0;
        }
 
@@ -1735,11 +1734,9 @@ static int cxd2841er_read_snr_c(struct cxd2841er_priv *priv, u32 *snr)
                *snr = -88 * (int32_t)sony_log(reg) + 86999;
                break;
        default:
-               cxd2841er_unfreeze_regs(priv);
                return -EINVAL;
        }
 
-       cxd2841er_unfreeze_regs(priv);
        return 0;
 }
 
@@ -1758,17 +1755,17 @@ static int cxd2841er_read_snr_t(struct cxd2841er_priv *priv, u32 *snr)
        cxd2841er_freeze_regs(priv);
        cxd2841er_write_reg(priv, I2C_SLVT, 0x00, 0x10);
        cxd2841er_read_regs(priv, I2C_SLVT, 0x28, data, sizeof(data));
+       cxd2841er_unfreeze_regs(priv);
+
        reg = ((u32)data[0] << 8) | (u32)data[1];
        if (reg == 0) {
                dev_dbg(&priv->i2c->dev,
                        "%s(): reg value out of range\n", __func__);
-               cxd2841er_unfreeze_regs(priv);
                return 0;
        }
        if (reg > 4996)
                reg = 4996;
        *snr = 10000 * ((intlog10(reg) - intlog10(5350 - reg)) >> 24) + 28500;
-       cxd2841er_unfreeze_regs(priv);
        return 0;
 }
 
@@ -1787,18 +1784,18 @@ static int cxd2841er_read_snr_t2(struct cxd2841er_priv *priv, u32 *snr)
        cxd2841er_freeze_regs(priv);
        cxd2841er_write_reg(priv, I2C_SLVT, 0x00, 0x20);
        cxd2841er_read_regs(priv, I2C_SLVT, 0x28, data, sizeof(data));
+       cxd2841er_unfreeze_regs(priv);
+
        reg = ((u32)data[0] << 8) | (u32)data[1];
        if (reg == 0) {
                dev_dbg(&priv->i2c->dev,
                        "%s(): reg value out of range\n", __func__);
-               cxd2841er_unfreeze_regs(priv);
                return 0;
        }
        if (reg > 10876)
                reg = 10876;
        *snr = 10000 * ((intlog10(reg) -
                intlog10(12600 - reg)) >> 24) + 32000;
-       cxd2841er_unfreeze_regs(priv);
        return 0;
 }
 
@@ -1818,15 +1815,15 @@ static int cxd2841er_read_snr_i(struct cxd2841er_priv *priv, u32 *snr)
        cxd2841er_freeze_regs(priv);
        cxd2841er_write_reg(priv, I2C_SLVT, 0x00, 0x60);
        cxd2841er_read_regs(priv, I2C_SLVT, 0x28, data, sizeof(data));
+       cxd2841er_unfreeze_regs(priv);
+
        reg = ((u32)data[0] << 8) | (u32)data[1];
        if (reg == 0) {
                dev_dbg(&priv->i2c->dev,
                                "%s(): reg value out of range\n", __func__);
-               cxd2841er_unfreeze_regs(priv);
                return 0;
        }
        *snr = 10000 * (intlog10(reg) >> 24) - 9031;
-       cxd2841er_unfreeze_regs(priv);
        return 0;
 }