From: Antti Palosaari Date: Sun, 14 Dec 2014 13:10:22 +0000 (-0300) Subject: [media] rtl2832: wrap DVBv5 BER to DVBv3 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=084330b746d9fb369cc6df17fdbc9dc8952249bf;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git [media] rtl2832: wrap DVBv5 BER to DVBv3 Change legacy DVBv3 read BER to return values calculated by DVBv5 statistics. Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c index 18f150105438..90d4f45d9958 100644 --- a/drivers/media/dvb-frontends/rtl2832.c +++ b/drivers/media/dvb-frontends/rtl2832.c @@ -805,20 +805,11 @@ static int rtl2832_read_snr(struct dvb_frontend *fe, u16 *snr) static int rtl2832_read_ber(struct dvb_frontend *fe, u32 *ber) { struct rtl2832_dev *dev = fe->demodulator_priv; - struct i2c_client *client = dev->client; - int ret; - u8 buf[2]; - - ret = rtl2832_rd_regs(dev, 0x4e, 3, buf, 2); - if (ret) - goto err; - *ber = buf[0] << 8 | buf[1]; + *ber = (dev->post_bit_error - dev->post_bit_error_prev); + dev->post_bit_error_prev = dev->post_bit_error; return 0; -err: - dev_dbg(&client->dev, "failed=%d\n", ret); - return ret; } static void rtl2832_stat_work(struct work_struct *work) diff --git a/drivers/media/dvb-frontends/rtl2832_priv.h b/drivers/media/dvb-frontends/rtl2832_priv.h index 5e90cd49d780..a44614c7af21 100644 --- a/drivers/media/dvb-frontends/rtl2832_priv.h +++ b/drivers/media/dvb-frontends/rtl2832_priv.h @@ -36,6 +36,7 @@ struct rtl2832_dev { struct dvb_frontend fe; struct delayed_work stat_work; fe_status_t fe_status; + u64 post_bit_error_prev; /* for old DVBv3 read_ber() calculation */ u64 post_bit_error; u64 post_bit_count; bool i2c_gate_state;