From patchwork Wed Jun 24 10:52:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 6666891 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5F1179F380 for ; Wed, 24 Jun 2015 10:52:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 691752065F for ; Wed, 24 Jun 2015 10:52:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 79E02205AA for ; Wed, 24 Jun 2015 10:52:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751758AbbFXKwm (ORCPT ); Wed, 24 Jun 2015 06:52:42 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:35855 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751249AbbFXKwm (ORCPT ); Wed, 24 Jun 2015 06:52:42 -0400 Received: from 177.17.241.89.dynamic.adsl.gvt.net.br ([177.17.241.89] helo=smtp.w2.samsung.com) by bombadil.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z7iIL-0006Eg-N6; Wed, 24 Jun 2015 10:52:41 +0000 Received: from mchehab by smtp.w2.samsung.com with local (Exim 4.85) (envelope-from ) id 1Z7iHi-0005v5-U8; Wed, 24 Jun 2015 07:52:02 -0300 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab , Mauro Carvalho Chehab , Malcolm Priestley Subject: [PATCH v2] [media] lmedm04: fix the range for relative measurements Date: Wed, 24 Jun 2015 07:52:01 -0300 Message-Id: <620275d149c129d3464cb73dd00b17e54128340c.1435143112.git.mchehab@osg.samsung.com> X-Mailer: git-send-email 2.4.3 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Relative measurements are typically between 0 and 0xffff. However, for some tuners (TUNER_S7395 and TUNER_S0194), the range were from 0 to 0xff00, with means that 100% is never archived. Also, TUNER_RS2000 uses a more complex math. So, create a macro that does the conversion using bit operations and use it for all conversions. The code is also easier to read with is a bonus. While here, remove a bogus comment. Signed-off-by: Mauro Carvalho Chehab diff --git a/drivers/media/usb/dvb-usb-v2/lmedm04.c b/drivers/media/usb/dvb-usb-v2/lmedm04.c index fcef2a33ef3d..4cc55b3a0558 100644 --- a/drivers/media/usb/dvb-usb-v2/lmedm04.c +++ b/drivers/media/usb/dvb-usb-v2/lmedm04.c @@ -257,6 +257,9 @@ static int lme2510_enable_pid(struct dvb_usb_device *d, u8 index, u16 pid_out) return ret; } +/* Convert range from 0x00-0xff to 0x0000-0xffff */ +#define reg_to_16bits(x) ((x) | ((x) << 8)) + static void lme2510_update_stats(struct dvb_usb_adapter *adap) { struct lme2510_state *st = adap_to_priv(adap); @@ -288,23 +291,17 @@ static void lme2510_update_stats(struct dvb_usb_adapter *adap) switch (st->tuner_config) { case TUNER_LG: - s_tmp = 0xff - st->signal_level; - s_tmp |= s_tmp << 8; - - c_tmp = 0xff - st->signal_sn; - c_tmp |= c_tmp << 8; + s_tmp = reg_to_16bits(0xff - st->signal_level); + c_tmp = reg_to_16bits(0xff - st->signal_sn); break; - /* fall through */ case TUNER_S7395: case TUNER_S0194: s_tmp = 0xffff - (((st->signal_level * 2) << 8) * 5 / 4); - - c_tmp = ((0xff - st->signal_sn - 0xa1) * 3) << 8; + c_tmp = reg_to_16bits((0xff - st->signal_sn - 0xa1) * 3); break; case TUNER_RS2000: - s_tmp = st->signal_level * 0xffff / 0xff; - - c_tmp = st->signal_sn * 0xffff / 0x7f; + s_tmp = reg_to_16bits(st->signal_level); + c_tmp = reg_to_16bits(st->signal_sn); } c->strength.len = 1;