lkml.org 
[lkml]   [2020]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 104/191] media: stv6110: get rid of a srate dead code
    Date
    From: Mauro Carvalho Chehab <mchehab@s-opensource.com>

    commit 282996925b4d78f9795d176f7fb409281c98d56d upstream

    The stv6110 has a weird code that checks if get_property
    and set_property ioctls are defined. If they're, it initializes
    a "srate" var from properties cache. Otherwise, it sets to
    15MBaud, with won't make any sense.

    Thankfully, it seems that someone else discovered the issue in
    the past, as "srate" is currently not used anywhere!

    So, get rid of that really weird dead code logic.

    Reported-by: Honza Petrous <jpetrous@gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/media/dvb-frontends/stv6110.c | 9 ---------
    1 file changed, 9 deletions(-)

    diff --git a/drivers/media/dvb-frontends/stv6110.c b/drivers/media/dvb-frontends/stv6110.c
    index 66a5a7f2295c0..93262b13c6447 100644
    --- a/drivers/media/dvb-frontends/stv6110.c
    +++ b/drivers/media/dvb-frontends/stv6110.c
    @@ -263,11 +263,9 @@ static int stv6110_get_frequency(struct dvb_frontend *fe, u32 *frequency)
    static int stv6110_set_frequency(struct dvb_frontend *fe, u32 frequency)
    {
    struct stv6110_priv *priv = fe->tuner_priv;
    - struct dtv_frontend_properties *c = &fe->dtv_property_cache;
    u8 ret = 0x04;
    u32 divider, ref, p, presc, i, result_freq, vco_freq;
    s32 p_calc, p_calc_opt = 1000, r_div, r_div_opt = 0, p_val;
    - s32 srate;

    dprintk("%s, freq=%d kHz, mclk=%d Hz\n", __func__,
    frequency, priv->mclk);
    @@ -278,13 +276,6 @@ static int stv6110_set_frequency(struct dvb_frontend *fe, u32 frequency)
    ((((priv->mclk / 1000000) - 16) & 0x1f) << 3);

    /* BB_GAIN = db/2 */
    - if (fe->ops.set_property && fe->ops.get_property) {
    - srate = c->symbol_rate;
    - dprintk("%s: Get Frontend parameters: srate=%d\n",
    - __func__, srate);
    - } else
    - srate = 15000000;
    -
    priv->regs[RSTV6110_CTRL2] &= ~0x0f;
    priv->regs[RSTV6110_CTRL2] |= (priv->gain & 0x0f);

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-29 22:22    [W:4.065 / U:0.608 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site