From patchwork Fri Aug 17 19:03:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Frey X-Patchwork-Id: 10569287 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0731C1390 for ; Fri, 17 Aug 2018 19:02:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE9CB2BED5 for ; Fri, 17 Aug 2018 19:02:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ECC622BE24; Fri, 17 Aug 2018 19:02:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8AE502BED7 for ; Fri, 17 Aug 2018 19:02:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728268AbeHQWGs (ORCPT ); Fri, 17 Aug 2018 18:06:48 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:38297 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728160AbeHQWGs (ORCPT ); Fri, 17 Aug 2018 18:06:48 -0400 Received: by mail-pg1-f195.google.com with SMTP id k3-v6so3971299pgq.5 for ; Fri, 17 Aug 2018 12:02:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QyI6y+M7b5tbk2abVsQkbrN7k51vUTAWF4b3HGZexvY=; b=R5Z0YMfvHeBzE/Ww+SDhOcJOkoCNDblDbW1LDgqxMViZta2tLjeXBHRKjrGiSvwrI1 K/4BF2IM56gHNDKnoY+qjETxc7FnWuSXwptqcRoxR729BvI2VTNGTzoVuWndRZyUq0JB ygX5wl3+5z/mguGZd1cRoya7IiRw/gcamkkFqkoux2ApYdt4XyG7aBNc3l9Ep81neK3k uSRGhtNtHf9ZSH3NJcDFI6/Y69xSRci6v9507/E+ByYvHTzeiG2MnrHKLtq24Ayp+a4i yu9RSf3xtszb4aS9d6TnmrxXzTuHhIhIJUmoMNdpJM5yTQkmr5N+8Jqm4hZktGjB221/ 5I3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QyI6y+M7b5tbk2abVsQkbrN7k51vUTAWF4b3HGZexvY=; b=oiNSZaUPifVlhg66l6k/espCussFnqSEc8ZRIuOj2VbtdJ5Gg+aN7j917EYVzJQp4i Gy9rMGDitCQAVXFxJrZXo/iyvePmCLH+dGIkyQ8tr0DG2wxzVqWc44dRtLqGQffxhw56 Q3qhHFM7QLCytyeS9f3wTjtmoHxMHF9Li1IE41wPbawhXoSOHpxJXwa8ehV/UXtJj8Dv PTRNripXam0Qf1Bg9KWAhfZ5pLtnQe1hRvU45uMdjEoka/Qx77dyy87UbMHC9yQcp/fD epJl40RU7aivtROQ0u7xKy182TlWEbnXno1vUFJdE6Zgv9KUxKkJaSxsee8jB+jAdafU mCDw== X-Gm-Message-State: AOUpUlF7A1AfEn/20IRVPj9rTgH4tEjeXMVhV71H/728ogD+xm2ToZFj NXH8hb2vGwPXrhBGRvgROzWzsEM4 X-Google-Smtp-Source: AA+uWPxWt8ODxEs2JG1uiZkfsA2xMsYLxNlgqln28slt3DCS2WLmvvzU2DrqZ2226fCMrN82xQtKNQ== X-Received: by 2002:a65:460e:: with SMTP id v14-v6mr33394608pgq.177.1534532536732; Fri, 17 Aug 2018 12:02:16 -0700 (PDT) Received: from dfrey-debian-linux.sierrawireless.local ([185.153.179.9]) by smtp.gmail.com with ESMTPSA id z22-v6sm6491358pgc.67.2018.08.17.12.02.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Aug 2018 12:02:15 -0700 (PDT) From: David Frey To: linux-iio@vger.kernel.org Cc: jic23@kernel.org, himanshujha199640@gmail.com, David Frey Subject: [PATCH v3 1/7] iio: chemical: bme680: use clamp macro Date: Fri, 17 Aug 2018 12:03:13 -0700 Message-Id: <20180817190319.13119-2-dpfrey@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180817190319.13119-1-dpfrey@gmail.com> References: <20180817190319.13119-1-dpfrey@gmail.com> Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: David Frey Reviewed-by: Himanshu Jha Tested-by: Himanshu Jha --- drivers/iio/chemical/bme680_core.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/iio/chemical/bme680_core.c b/drivers/iio/chemical/bme680_core.c index 36b83c851515..35cbcb16c9f9 100644 --- a/drivers/iio/chemical/bme680_core.c +++ b/drivers/iio/chemical/bme680_core.c @@ -408,10 +408,7 @@ static u32 bme680_compensate_humid(struct bme680_data *data, var6 = (var4 * var5) >> 1; calc_hum = (((var3 + var6) >> 10) * 1000) >> 12; - if (calc_hum > 100000) /* Cap at 100%rH */ - calc_hum = 100000; - else if (calc_hum < 0) - calc_hum = 0; + calc_hum = clamp(calc_hum, 0, 100000); /* clamp between 0-100 %rH */ return calc_hum; } From patchwork Fri Aug 17 19:03:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Frey X-Patchwork-Id: 10569289 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0433D1390 for ; Fri, 17 Aug 2018 19:02:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E9EEF2BDB9 for ; Fri, 17 Aug 2018 19:02:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E87EB2BED1; Fri, 17 Aug 2018 19:02:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80C4F2BDB9 for ; Fri, 17 Aug 2018 19:02:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728276AbeHQWGu (ORCPT ); Fri, 17 Aug 2018 18:06:50 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:35207 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728160AbeHQWGu (ORCPT ); Fri, 17 Aug 2018 18:06:50 -0400 Received: by mail-pf1-f194.google.com with SMTP id p12-v6so3890731pfh.2 for ; Fri, 17 Aug 2018 12:02:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ttrfv5i6xFmcSyrj4UBga01xaezhzNQuqDgi3v7aaM0=; b=E4gpCS+Hj+zu3pwKWRhOgDYrCNXqD+yKfj41Aeyjtwq6rfRAVA/iltIs29kvZkpvIc 4AQ9aZBQPhAYTX/w7gqxtEVJt09rjnkTLm1IqIe3MfQy2BtUT8IoDR/L0117umjH8jfB QPaCRhUxZik84lRGvjjUXjtKTfUuMjcWC6BvWcJxLF9TOOrbxJGWa/p3+I9pIoisbn7H A0urKS/ngjlBmdzFhHOvUigtACvfXVFXxw+2wnWfHDRTQU1LRaSgOhDeB/R8VdmESnBP 2HZVq6/ULl9M1G4jyzwCij/l7uh3ym3iCoulENCOkKQyyw1s4RYFXSu2iLg+RiU32pX/ TVnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ttrfv5i6xFmcSyrj4UBga01xaezhzNQuqDgi3v7aaM0=; b=EGkKBIt3gEXiNolqqY2t4HB7pF0bfkFdYsXN/t63ObBJZ+PpNj1l4IwbXlAKDd2rds /oCobaqGNXBva1pVkW1wTq3Ji/IO21tmOzgdZT+ECsb6vlz+WQTfVQXeCFEmY2dA8z2A zPsHl30qEeS4Y6/dN6SJovtKrId2a5hCl2wriIjsg1aGJshv9qZRfYPAA7iDrS8uim1t bilaE/S/kgXWI/RH1kqxHKRqJpUP741vLCdFXxTrz+Vn7ekoBk5ZjF/YXwRIpcEedU1k FXOtifldiFe8569MWTyTwVjw/NanI9hq6IO89iOCq6gMuTc+KoRJ3/pWB+vnTzqXou4Z 0gYQ== X-Gm-Message-State: AOUpUlFs71M1mT4lnDGtjzA5gU+TM81dCQrGDlXk9q+npc/ensJX36lP SelEueSm2Y1BbHzFKtkbWQq74V5q X-Google-Smtp-Source: AA+uWPwDTbyfIenJa+ew5a/pf1s6cDgketnlOpjWILfD0Xl1iv8YahgkhQxop21NdZ/zjVF7s47tpA== X-Received: by 2002:a63:7f0b:: with SMTP id a11-v6mr6441801pgd.22.1534532538285; Fri, 17 Aug 2018 12:02:18 -0700 (PDT) Received: from dfrey-debian-linux.sierrawireless.local ([185.153.179.9]) by smtp.gmail.com with ESMTPSA id z22-v6sm6491358pgc.67.2018.08.17.12.02.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Aug 2018 12:02:17 -0700 (PDT) From: David Frey To: linux-iio@vger.kernel.org Cc: jic23@kernel.org, himanshujha199640@gmail.com, David Frey Subject: [PATCH v3 2/7] iio: chemical: bme680: cleanup bme680_read_calib formatting Date: Fri, 17 Aug 2018 12:03:14 -0700 Message-Id: <20180817190319.13119-3-dpfrey@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180817190319.13119-1-dpfrey@gmail.com> References: <20180817190319.13119-1-dpfrey@gmail.com> Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: David Frey Reviewed-by: Himanshu Jha Tested-by: Himanshu Jha --- drivers/iio/chemical/bme680_core.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/drivers/iio/chemical/bme680_core.c b/drivers/iio/chemical/bme680_core.c index 35cbcb16c9f9..cde08d57e7d5 100644 --- a/drivers/iio/chemical/bme680_core.c +++ b/drivers/iio/chemical/bme680_core.c @@ -102,16 +102,14 @@ static int bme680_read_calib(struct bme680_data *data, __le16 buf; /* Temperature related coefficients */ - ret = regmap_bulk_read(data->regmap, BME680_T1_LSB_REG, - (u8 *) &buf, 2); + ret = regmap_bulk_read(data->regmap, BME680_T1_LSB_REG, (u8 *) &buf, 2); if (ret < 0) { dev_err(dev, "failed to read BME680_T1_LSB_REG\n"); return ret; } calib->par_t1 = le16_to_cpu(buf); - ret = regmap_bulk_read(data->regmap, BME680_T2_LSB_REG, - (u8 *) &buf, 2); + ret = regmap_bulk_read(data->regmap, BME680_T2_LSB_REG, (u8 *) &buf, 2); if (ret < 0) { dev_err(dev, "failed to read BME680_T2_LSB_REG\n"); return ret; @@ -126,16 +124,14 @@ static int bme680_read_calib(struct bme680_data *data, calib->par_t3 = tmp; /* Pressure related coefficients */ - ret = regmap_bulk_read(data->regmap, BME680_P1_LSB_REG, - (u8 *) &buf, 2); + ret = regmap_bulk_read(data->regmap, BME680_P1_LSB_REG, (u8 *) &buf, 2); if (ret < 0) { dev_err(dev, "failed to read BME680_P1_LSB_REG\n"); return ret; } calib->par_p1 = le16_to_cpu(buf); - ret = regmap_bulk_read(data->regmap, BME680_P2_LSB_REG, - (u8 *) &buf, 2); + ret = regmap_bulk_read(data->regmap, BME680_P2_LSB_REG, (u8 *) &buf, 2); if (ret < 0) { dev_err(dev, "failed to read BME680_P2_LSB_REG\n"); return ret; @@ -149,16 +145,14 @@ static int bme680_read_calib(struct bme680_data *data, } calib->par_p3 = tmp; - ret = regmap_bulk_read(data->regmap, BME680_P4_LSB_REG, - (u8 *) &buf, 2); + ret = regmap_bulk_read(data->regmap, BME680_P4_LSB_REG, (u8 *) &buf, 2); if (ret < 0) { dev_err(dev, "failed to read BME680_P4_LSB_REG\n"); return ret; } calib->par_p4 = le16_to_cpu(buf); - ret = regmap_bulk_read(data->regmap, BME680_P5_LSB_REG, - (u8 *) &buf, 2); + ret = regmap_bulk_read(data->regmap, BME680_P5_LSB_REG, (u8 *) &buf, 2); if (ret < 0) { dev_err(dev, "failed to read BME680_P5_LSB_REG\n"); return ret; @@ -179,16 +173,14 @@ static int bme680_read_calib(struct bme680_data *data, } calib->par_p7 = tmp; - ret = regmap_bulk_read(data->regmap, BME680_P8_LSB_REG, - (u8 *) &buf, 2); + ret = regmap_bulk_read(data->regmap, BME680_P8_LSB_REG, (u8 *) &buf, 2); if (ret < 0) { dev_err(dev, "failed to read BME680_P8_LSB_REG\n"); return ret; } calib->par_p8 = le16_to_cpu(buf); - ret = regmap_bulk_read(data->regmap, BME680_P9_LSB_REG, - (u8 *) &buf, 2); + ret = regmap_bulk_read(data->regmap, BME680_P9_LSB_REG, (u8 *) &buf, 2); if (ret < 0) { dev_err(dev, "failed to read BME680_P9_LSB_REG\n"); return ret; @@ -208,30 +200,26 @@ static int bme680_read_calib(struct bme680_data *data, dev_err(dev, "failed to read BME680_H1_MSB_REG\n"); return ret; } - ret = regmap_read(data->regmap, BME680_H1_LSB_REG, &tmp_lsb); if (ret < 0) { dev_err(dev, "failed to read BME680_H1_LSB_REG\n"); return ret; } - calib->par_h1 = (tmp_msb << BME680_HUM_REG_SHIFT_VAL) | - (tmp_lsb & BME680_BIT_H1_DATA_MSK); + (tmp_lsb & BME680_BIT_H1_DATA_MSK); ret = regmap_read(data->regmap, BME680_H2_MSB_REG, &tmp_msb); if (ret < 0) { dev_err(dev, "failed to read BME680_H2_MSB_REG\n"); return ret; } - ret = regmap_read(data->regmap, BME680_H2_LSB_REG, &tmp_lsb); if (ret < 0) { dev_err(dev, "failed to read BME680_H2_LSB_REG\n"); return ret; } - calib->par_h2 = (tmp_msb << BME680_HUM_REG_SHIFT_VAL) | - (tmp_lsb >> BME680_HUM_REG_SHIFT_VAL); + (tmp_lsb >> BME680_HUM_REG_SHIFT_VAL); ret = regmap_read(data->regmap, BME680_H3_REG, &tmp); if (ret < 0) { @@ -276,8 +264,8 @@ static int bme680_read_calib(struct bme680_data *data, } calib->par_gh1 = tmp; - ret = regmap_bulk_read(data->regmap, BME680_GH2_LSB_REG, - (u8 *) &buf, 2); + ret = regmap_bulk_read(data->regmap, BME680_GH2_LSB_REG, (u8 *) &buf, + 2); if (ret < 0) { dev_err(dev, "failed to read BME680_GH2_LSB_REG\n"); return ret; From patchwork Fri Aug 17 19:03:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Frey X-Patchwork-Id: 10569291 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8D54013B6 for ; Fri, 17 Aug 2018 19:02:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 806B92BDAF for ; Fri, 17 Aug 2018 19:02:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E6232BED4; Fri, 17 Aug 2018 19:02:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99BCC2BE28 for ; Fri, 17 Aug 2018 19:02:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728160AbeHQWGw (ORCPT ); Fri, 17 Aug 2018 18:06:52 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:44353 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728041AbeHQWGv (ORCPT ); Fri, 17 Aug 2018 18:06:51 -0400 Received: by mail-pl0-f67.google.com with SMTP id ba4-v6so4106940plb.11 for ; Fri, 17 Aug 2018 12:02:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4/2cqLugQvamHErFzwja+NH6Dri67gjvCg4YaAAH4m8=; b=nt+RizzvZOmPXqDiUOlltaUhuy3ppKCIe+7c+DoJKzTDvSSzCyJW+YpZPENM++5n3V fRzOgX2iC0I5D1jSoCs2cTe/vDisodauSh8JgeaSFUM8hpCs4lSUwJT1yavqa1glP70d 9z/fSWu7HutIQ9964nKcoIS/wMceb0QuswA8R/z8pXf+YauYkk7mnkNyY+zWoomRq0qR oDMzkANa/aDSciNXR6gIBeVFkMZ+tpMf5cTE+2ZBc03b63lG8Lp1o9nagiU8xSpY05lO bdrWUJL7QfVV9qKNd4ENOOh4KkbswV5fDB344oYrddkSW/abvA2oldbZkfA5F3ZQa3+L xkWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4/2cqLugQvamHErFzwja+NH6Dri67gjvCg4YaAAH4m8=; b=nSUmV1t8pa66JziXCZAgh3CYUHTS8kG9EDqDSIH09swNroXO9CHjWF/ybz5ozqosML 77Oq+NGnqyJcgKsswjfqtiUu9A7Gu+mci1rSYMjAAeSlJMLI/dBKQdP4bNnR2k1T/7rw DIBuTptSaeGCN7ejDhLcG0BI6FPdYGX4rY9PRFQYc1vqF5iD3ySRZnaD93wZYGfGqlEX sU05UVy5mrMigTtmNKxIZU4n4rde1KA3/HDtS9SPc7gk9nq4JViUGjtxetx1g3HxOBBe GB+w10c1fQ6bhx+V/zdO5v0bgTvwvBe2lgh/TcwFmCQAbeJNQ2shAfvPN1E46kXanujT lVhQ== X-Gm-Message-State: AOUpUlFUnYIt7LwOeySLobmQ8ABcL/bMLHU+XPxmZHDRe5wA2GiDjtPy AVsL0+hJJpVljVZyrg6SSQfEKth7 X-Google-Smtp-Source: AA+uWPydSckJUvU3tFSoKwZCVK+SkGTk4y7h3Y/6LZr4eKjmcMuZ5Ltuqseck8C1fP8V8/6czxkNDw== X-Received: by 2002:a17:902:d706:: with SMTP id w6-v6mr34756335ply.158.1534532539834; Fri, 17 Aug 2018 12:02:19 -0700 (PDT) Received: from dfrey-debian-linux.sierrawireless.local ([185.153.179.9]) by smtp.gmail.com with ESMTPSA id z22-v6sm6491358pgc.67.2018.08.17.12.02.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Aug 2018 12:02:18 -0700 (PDT) From: David Frey To: linux-iio@vger.kernel.org Cc: jic23@kernel.org, himanshujha199640@gmail.com, David Frey Subject: [PATCH v3 3/7] iio: chemical: bme680: indent #defines consistently Date: Fri, 17 Aug 2018 12:03:15 -0700 Message-Id: <20180817190319.13119-4-dpfrey@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180817190319.13119-1-dpfrey@gmail.com> References: <20180817190319.13119-1-dpfrey@gmail.com> Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: David Frey Reviewed-by: Himanshu Jha Tested-by: Himanshu Jha --- drivers/iio/chemical/bme680.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/iio/chemical/bme680.h b/drivers/iio/chemical/bme680.h index e049323f209a..dd4247d364a0 100644 --- a/drivers/iio/chemical/bme680.h +++ b/drivers/iio/chemical/bme680.h @@ -4,10 +4,10 @@ #define BME680_REG_CHIP_I2C_ID 0xD0 #define BME680_REG_CHIP_SPI_ID 0x50 -#define BME680_CHIP_ID_VAL 0x61 +#define BME680_CHIP_ID_VAL 0x61 #define BME680_REG_SOFT_RESET_I2C 0xE0 #define BME680_REG_SOFT_RESET_SPI 0x60 -#define BME680_CMD_SOFTRESET 0xB6 +#define BME680_CMD_SOFTRESET 0xB6 #define BME680_REG_STATUS 0x73 #define BME680_SPI_MEM_PAGE_BIT BIT(4) #define BME680_SPI_MEM_PAGE_1_VAL 1 @@ -18,6 +18,7 @@ #define BME680_REG_GAS_MSB 0x2A #define BME680_REG_GAS_R_LSB 0x2B #define BME680_GAS_STAB_BIT BIT(4) +#define BME680_GAS_RANGE_MASK 0x0F #define BME680_REG_CTRL_HUMIDITY 0x72 #define BME680_OSRS_HUMIDITY_MASK GENMASK(2, 0) @@ -26,9 +27,8 @@ #define BME680_OSRS_TEMP_MASK GENMASK(7, 5) #define BME680_OSRS_PRESS_MASK GENMASK(4, 2) #define BME680_MODE_MASK GENMASK(1, 0) - -#define BME680_MODE_FORCED 1 -#define BME680_MODE_SLEEP 0 +#define BME680_MODE_FORCED 1 +#define BME680_MODE_SLEEP 0 #define BME680_REG_CONFIG 0x75 #define BME680_FILTER_MASK GENMASK(4, 2) @@ -42,13 +42,12 @@ #define BME680_BIT_H1_DATA_MSK 0x0F #define BME680_REG_RES_HEAT_RANGE 0x02 -#define BME680_RHRANGE_MSK 0x30 +#define BME680_RHRANGE_MSK 0x30 #define BME680_REG_RES_HEAT_VAL 0x00 #define BME680_REG_RANGE_SW_ERR 0x04 -#define BME680_RSERROR_MSK 0xF0 +#define BME680_RSERROR_MSK 0xF0 #define BME680_REG_RES_HEAT_0 0x5A #define BME680_REG_GAS_WAIT_0 0x64 -#define BME680_GAS_RANGE_MASK 0x0F #define BME680_ADC_GAS_RES_SHIFT 6 #define BME680_AMB_TEMP 25 From patchwork Fri Aug 17 19:03:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Frey X-Patchwork-Id: 10569293 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CE005174F for ; Fri, 17 Aug 2018 19:02:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C0E122BECA for ; Fri, 17 Aug 2018 19:02:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF4E62BED8; Fri, 17 Aug 2018 19:02:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A6182BECA for ; Fri, 17 Aug 2018 19:02:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728278AbeHQWGx (ORCPT ); Fri, 17 Aug 2018 18:06:53 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:45193 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728041AbeHQWGx (ORCPT ); Fri, 17 Aug 2018 18:06:53 -0400 Received: by mail-pf1-f195.google.com with SMTP id i26-v6so3869372pfo.12 for ; Fri, 17 Aug 2018 12:02:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fK3ZFnNpHVA2sLRnQMF5tH4O5cq3dnaDtvaIeqDgX7U=; b=bd+USXegv5fvkPLsHD7oKimbkr+OBnTA8VSn+j0DmH9rAh8E4j0SZ6CiXXqKvN1p0u pFlXaM5d7Ty85wZrzIkhh6LOwOmxw6fZmb5Kfu+aZ9EGb/khI0B6rVa4uCmwZMPr2Plw 4TvtM2b43VY02KmiCmORaS9zYDanzjBij7sK2tLZJlL1mrmC2U0KcrRIvZld1Q100rOw 47SIlx0wDcl9gCC8wqpy9wdhV/R9SVuTOhmIdIUyHb02CqgIrQBvT3g401sVx6noPzI8 74U4tEDu5wxYRuwUcGc+BkFm3QlhmMH03pqeT1jDioejKRmO9XS3bWEkxMx0QBAkW5NU P1YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fK3ZFnNpHVA2sLRnQMF5tH4O5cq3dnaDtvaIeqDgX7U=; b=diSVN8cQsjrXsz5zzfR+NLNNs6A2jVdCbQrbi9BvCLpMXT+S4aHBq93ZjiOaQ7SqLD 3Re/Nw49cGCijdeFl7oxj+AwgwKKTukYcz1jou3e+ZTs/2MmiETmt6TRTg2DdmQGGW8T ErkbfgxTlF1GunGscN2lEKUhiAi5FKqw2tQnurVvxCCM3cN36LM9bvqdzpk4Ln4y6QKf d3IdJ48IszgYpPOjUO9LApfrgZ3vzqm1izD6L+2D+ckWgOoLXmgBI/jKR++v7Vs/asjY HELfvZi8lFzB9TA9pUi2J89yrDHJW7kH68rPm5couRqnWL7q4IK/DjwQADAC6CRQxQXh YyPw== X-Gm-Message-State: AOUpUlFL/ZF7GbfK6Nq3UEhN/KRZKb0/MFOvvfBvuhUxLj4PV5rzsu3f qsh4qgdUZ0AlyRbh+h7Wr13NqY1n X-Google-Smtp-Source: AA+uWPzPSGmJMvxKWJlI+zwwD9jGR/alz8KlJ+JDQ0HX36AU0zkQ7jPM1sKSuIQXjbyXFz3aGc1bGg== X-Received: by 2002:a63:524e:: with SMTP id s14-v6mr34328759pgl.35.1534532541427; Fri, 17 Aug 2018 12:02:21 -0700 (PDT) Received: from dfrey-debian-linux.sierrawireless.local ([185.153.179.9]) by smtp.gmail.com with ESMTPSA id z22-v6sm6491358pgc.67.2018.08.17.12.02.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Aug 2018 12:02:20 -0700 (PDT) From: David Frey To: linux-iio@vger.kernel.org Cc: jic23@kernel.org, himanshujha199640@gmail.com, David Frey Subject: [PATCH v3 4/7] iio: chemical: bme680: change MSK->MASK in #defines Date: Fri, 17 Aug 2018 12:03:16 -0700 Message-Id: <20180817190319.13119-5-dpfrey@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180817190319.13119-1-dpfrey@gmail.com> References: <20180817190319.13119-1-dpfrey@gmail.com> Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Convert all defines to use "MASK" instead of a mix of "MSK" and "MASK" Signed-off-by: David Frey Reviewed-by: Himanshu Jha Tested-by: Himanshu Jha --- drivers/iio/chemical/bme680.h | 6 +++--- drivers/iio/chemical/bme680_core.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/iio/chemical/bme680.h b/drivers/iio/chemical/bme680.h index dd4247d364a0..437d75c2bad5 100644 --- a/drivers/iio/chemical/bme680.h +++ b/drivers/iio/chemical/bme680.h @@ -39,13 +39,13 @@ #define BME680_MAX_OVERFLOW_VAL 0x40000000 #define BME680_HUM_REG_SHIFT_VAL 4 -#define BME680_BIT_H1_DATA_MSK 0x0F +#define BME680_BIT_H1_DATA_MASK 0x0F #define BME680_REG_RES_HEAT_RANGE 0x02 -#define BME680_RHRANGE_MSK 0x30 +#define BME680_RHRANGE_MASK 0x30 #define BME680_REG_RES_HEAT_VAL 0x00 #define BME680_REG_RANGE_SW_ERR 0x04 -#define BME680_RSERROR_MSK 0xF0 +#define BME680_RSERROR_MASK 0xF0 #define BME680_REG_RES_HEAT_0 0x5A #define BME680_REG_GAS_WAIT_0 0x64 #define BME680_ADC_GAS_RES_SHIFT 6 diff --git a/drivers/iio/chemical/bme680_core.c b/drivers/iio/chemical/bme680_core.c index cde08d57e7d5..7c7df40b615f 100644 --- a/drivers/iio/chemical/bme680_core.c +++ b/drivers/iio/chemical/bme680_core.c @@ -206,7 +206,7 @@ static int bme680_read_calib(struct bme680_data *data, return ret; } calib->par_h1 = (tmp_msb << BME680_HUM_REG_SHIFT_VAL) | - (tmp_lsb & BME680_BIT_H1_DATA_MSK); + (tmp_lsb & BME680_BIT_H1_DATA_MASK); ret = regmap_read(data->regmap, BME680_H2_MSB_REG, &tmp_msb); if (ret < 0) { @@ -285,7 +285,7 @@ static int bme680_read_calib(struct bme680_data *data, dev_err(dev, "failed to read resistance heat range\n"); return ret; } - calib->res_heat_range = (tmp & BME680_RHRANGE_MSK) / 16; + calib->res_heat_range = (tmp & BME680_RHRANGE_MASK) / 16; ret = regmap_read(data->regmap, BME680_REG_RES_HEAT_VAL, &tmp); if (ret < 0) { @@ -299,7 +299,7 @@ static int bme680_read_calib(struct bme680_data *data, dev_err(dev, "failed to read range software error\n"); return ret; } - calib->range_sw_err = (tmp & BME680_RSERROR_MSK) / 16; + calib->range_sw_err = (tmp & BME680_RSERROR_MASK) / 16; return 0; } From patchwork Fri Aug 17 19:03:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Frey X-Patchwork-Id: 10569295 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 06EAC1390 for ; Fri, 17 Aug 2018 19:02:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EAB9C29ECC for ; Fri, 17 Aug 2018 19:02:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D97352A22C; Fri, 17 Aug 2018 19:02:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A7F029ECC for ; Fri, 17 Aug 2018 19:02:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728030AbeHQWHZ (ORCPT ); Fri, 17 Aug 2018 18:07:25 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:43770 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727995AbeHQWHY (ORCPT ); Fri, 17 Aug 2018 18:07:24 -0400 Received: by mail-pf1-f194.google.com with SMTP id j26-v6so3873584pfi.10 for ; Fri, 17 Aug 2018 12:02:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vB7kbCxn9eSm7X+KHLhE34RdHb0fmJruT93NCyWQyFw=; b=YimpUVdQ6Ux7zbgoa7ObykztoPx8FE4wxDT7Q1KyCWYQqCJDHEYmVZbK/hbeBf8/sW uo4fFUW27wW4dxYfjBECISTWZf3KgHvzZunMcIm1YYmFr7YbGpCKd8OCpGHzh68002Pw VJq0SfC0rAc5Kb3nVPX/h3K/M/hOiOjYesAjt1vcfQ/pathxF2Zgq0EUnilDP0lnzcYC E9Es0XBEeQzWnydc/Zi02P9OtqroBkHqJ0xgl7lmR6/P7kEW6M/wZLbrUvnlg9NL0eOU JZt9OZJ7QT+sbqgMbjfFQH/PdEyUQGEk6GlpFd9uw+rABP65yNjVkANlz5WhT/1/MknX 8C+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vB7kbCxn9eSm7X+KHLhE34RdHb0fmJruT93NCyWQyFw=; b=bET0po7soFLNrrVYXy8jpCsaWsk4M37YMjxJNAVN0ePvPVMNBCReCY9hTWdBqV/mEw uDV2tyPmAQbmb/jUFGIlV9c6n53I4VnH2k1VhCECX2gjBG6t8klC3k2XIoM0GHxn1xBY nA8NToHn6cvSE2u01tOxlx7StIgqRFBzPK7jgfIq4i0PbbBNH3n0+PS40Nyokrnvy5Q9 CKosdGbta6dIlJKQBtlTPjO6T3ng4NLkv51TVv3WynOZ3t8xK14aU0FfFhT/13TrQWI0 EOjN++PQHqBpyu08e9EK/gaD13yT0nwCCub+RjZwgkG4gcOQez0I6MnkddPXyZlmmkPQ vjtA== X-Gm-Message-State: AOUpUlEcOZvOyHrARUljUI/PhiTEft9ybNLk1mD8gP5q/EEYz74SM5lA Lv6iYXEkxbL0ay4jkB5+aFg7Ccs6 X-Google-Smtp-Source: AA+uWPwfbJKD9Fn2xwnJqNKSrN5q9whaLpUmaHgpnblrU4G/KobpHQPs0au4DDZBbpJXHQLQ5boZqg== X-Received: by 2002:a63:e457:: with SMTP id i23-v6mr34196204pgk.127.1534532572994; Fri, 17 Aug 2018 12:02:52 -0700 (PDT) Received: from dfrey-debian-linux.sierrawireless.local ([185.153.179.9]) by smtp.gmail.com with ESMTPSA id z22-v6sm6491358pgc.67.2018.08.17.12.02.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Aug 2018 12:02:22 -0700 (PDT) From: David Frey To: linux-iio@vger.kernel.org Cc: jic23@kernel.org, himanshujha199640@gmail.com, David Frey Subject: [PATCH v3 5/7] iio: chemical: bme680: use GENMASK macro Date: Fri, 17 Aug 2018 12:03:17 -0700 Message-Id: <20180817190319.13119-6-dpfrey@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180817190319.13119-1-dpfrey@gmail.com> References: <20180817190319.13119-1-dpfrey@gmail.com> Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Replace hardcoded bit masks with GENMASK macro Signed-off-by: David Frey Reviewed-by: Himanshu Jha Tested-by: Himanshu Jha --- drivers/iio/chemical/bme680.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/iio/chemical/bme680.h b/drivers/iio/chemical/bme680.h index 437d75c2bad5..a9f2a9a6abc5 100644 --- a/drivers/iio/chemical/bme680.h +++ b/drivers/iio/chemical/bme680.h @@ -18,7 +18,7 @@ #define BME680_REG_GAS_MSB 0x2A #define BME680_REG_GAS_R_LSB 0x2B #define BME680_GAS_STAB_BIT BIT(4) -#define BME680_GAS_RANGE_MASK 0x0F +#define BME680_GAS_RANGE_MASK GENMASK(3, 0) #define BME680_REG_CTRL_HUMIDITY 0x72 #define BME680_OSRS_HUMIDITY_MASK GENMASK(2, 0) @@ -39,13 +39,13 @@ #define BME680_MAX_OVERFLOW_VAL 0x40000000 #define BME680_HUM_REG_SHIFT_VAL 4 -#define BME680_BIT_H1_DATA_MASK 0x0F +#define BME680_BIT_H1_DATA_MASK GENMASK(3, 0) #define BME680_REG_RES_HEAT_RANGE 0x02 -#define BME680_RHRANGE_MASK 0x30 +#define BME680_RHRANGE_MASK GENMASK(5, 4) #define BME680_REG_RES_HEAT_VAL 0x00 #define BME680_REG_RANGE_SW_ERR 0x04 -#define BME680_RSERROR_MASK 0xF0 +#define BME680_RSERROR_MASK GENMASK(7, 4) #define BME680_REG_RES_HEAT_0 0x5A #define BME680_REG_GAS_WAIT_0 0x64 #define BME680_ADC_GAS_RES_SHIFT 6 From patchwork Fri Aug 17 19:03:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Frey X-Patchwork-Id: 10569297 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E30D01390 for ; Fri, 17 Aug 2018 19:03:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D33812A677 for ; Fri, 17 Aug 2018 19:03:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C66B02A696; Fri, 17 Aug 2018 19:03:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 707932A677 for ; Fri, 17 Aug 2018 19:03:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728041AbeHQWHn (ORCPT ); Fri, 17 Aug 2018 18:07:43 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:45863 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727995AbeHQWHn (ORCPT ); Fri, 17 Aug 2018 18:07:43 -0400 Received: by mail-pl0-f68.google.com with SMTP id j8-v6so4101875pll.12 for ; Fri, 17 Aug 2018 12:03:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FbPqETxP3MqZM8imy3ulQ1hh/ljLzQ+hZtJWG2ibBHU=; b=XtUCQshaiK2LKb/NXub1c9bODBN2PHjaAw9W5SFYsGRczaE2b16MtmoQwcJbCoIMf4 e1VireOVg8jmW1EmXn6m7wB2XxjVsy1ivTMp73mmN9IPFK8ycWBuDyVP/XnCbs417cHk +SO6nNlcIB2oJWhaTtb31yloMDWJ+nQtoRSAGPc34lERM76yJUA/x+OYCT+ZCwxKmtc7 q0oy4fhlJIIEiRRjGg+G5HjHsbfF7bZ2ljZta2otFKKuMlI3K+c7ZX9vLtwqm0HF9897 ulOOzcqajdd5PLYeOcSnWsYod9Z9eVQqU0CdqZDTCuE+xBKFDepxRHPo68d/jeqX7Ehm IyIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FbPqETxP3MqZM8imy3ulQ1hh/ljLzQ+hZtJWG2ibBHU=; b=amMCUJ1iQOb+IaA4j/uy3LkIR7s8wkufUThlqzPdcFaWC9Pk6slBV0rEuEiRETET8K WOqQf6NWcMeuePcxiCHOUHM0xz59OgBipmhn91e9mEBMKBXYsDIfymNq9AMjRApg6k4f TP1U+K4N7pyDy60KKbEFrMYEtwOvFY7tNRfVqcWW7VT56ztxbHeBrwWCS1YjN+eBkUVU nOoP+aY1CLvg4LJaRTySeeHZRkFAmP+exJPNVo7G5vFUjgX7HstVIYpUhp/MtcxjB0hW 6/tXqQJd1zlqF0eJAiCSHUts8zU5t6K35dVpmlFqkQO8ZP0hW40MRO9j0+pVYk+e5HU3 aajA== X-Gm-Message-State: AOUpUlGyJvy9jl2mU+zAGEL/rhITxwUDoabkewxsL0SsVaJJ60wJVLkI p8QtAHXgQHShVofxr585vWQqDlUl X-Google-Smtp-Source: AA+uWPyIHB/tZ+7ItYO8+/fhvHUK0IKv72RTEXhshKy380HeChA3Y0W2MO81mLUMqUIsbxI5dlmeZw== X-Received: by 2002:a17:902:4401:: with SMTP id k1-v6mr34152791pld.97.1534532591055; Fri, 17 Aug 2018 12:03:11 -0700 (PDT) Received: from dfrey-debian-linux.sierrawireless.local ([185.153.179.9]) by smtp.gmail.com with ESMTPSA id z22-v6sm6491358pgc.67.2018.08.17.12.03.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Aug 2018 12:03:10 -0700 (PDT) From: David Frey To: linux-iio@vger.kernel.org Cc: jic23@kernel.org, himanshujha199640@gmail.com, David Frey Subject: [PATCH v3 6/7] iio: chemical: bme680: use FIELD_GET macro Date: Fri, 17 Aug 2018 12:03:18 -0700 Message-Id: <20180817190319.13119-7-dpfrey@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180817190319.13119-1-dpfrey@gmail.com> References: <20180817190319.13119-1-dpfrey@gmail.com> Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use the FIELD_GET macro instead of explicit mask and shift. Signed-off-by: David Frey Reviewed-by: Himanshu Jha Tested-by: Himanshu Jha --- drivers/iio/chemical/bme680_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/iio/chemical/bme680_core.c b/drivers/iio/chemical/bme680_core.c index 7c7df40b615f..46afc93041f5 100644 --- a/drivers/iio/chemical/bme680_core.c +++ b/drivers/iio/chemical/bme680_core.c @@ -285,7 +285,7 @@ static int bme680_read_calib(struct bme680_data *data, dev_err(dev, "failed to read resistance heat range\n"); return ret; } - calib->res_heat_range = (tmp & BME680_RHRANGE_MASK) / 16; + calib->res_heat_range = FIELD_GET(BME680_RHRANGE_MASK, tmp); ret = regmap_read(data->regmap, BME680_REG_RES_HEAT_VAL, &tmp); if (ret < 0) { @@ -299,7 +299,7 @@ static int bme680_read_calib(struct bme680_data *data, dev_err(dev, "failed to read range software error\n"); return ret; } - calib->range_sw_err = (tmp & BME680_RSERROR_MASK) / 16; + calib->range_sw_err = FIELD_GET(BME680_RSERROR_MASK, tmp); return 0; } From patchwork Fri Aug 17 19:03:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Frey X-Patchwork-Id: 10569299 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0E2D113B6 for ; Fri, 17 Aug 2018 19:03:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F0FC92A696 for ; Fri, 17 Aug 2018 19:03:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E58522A7C9; Fri, 17 Aug 2018 19:03:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 721062A696 for ; Fri, 17 Aug 2018 19:03:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728075AbeHQWHp (ORCPT ); Fri, 17 Aug 2018 18:07:45 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:39287 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728049AbeHQWHp (ORCPT ); Fri, 17 Aug 2018 18:07:45 -0400 Received: by mail-pl0-f65.google.com with SMTP id w14-v6so4114311plp.6 for ; Fri, 17 Aug 2018 12:03:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Bk+eIMSQv+g5xCCaEFgobaj9D5mnn6TqG7iKGBAJ2J4=; b=UR1dTlVKbq5MXCCDB6budTJxwhigHKvrUMuu4Mf6XlGzNuFTwsSavtXSZEZfluq9xs sFDwexMIprGt5/nQfXRsAvKCFcLrMNpCkU9me7tQzXUmgcDNk32n3LcmL72dSn+RmjtL fFeDs4DIN8iUDDr1ojAt75QoVzzpw62rRyntG8oqptqrp8PNIkPqHUyqhLS2vlON7vEc 32lpgriSawzfjlDxBNIT3jaSBH0A9ENSlB9p21IMyqn1wupkGW2ih9MY2A3tZy8Q0aBv WbxkhXEqnSrkAIRKhmKOz6WmMfhY5S2qdP7no2U9HdDIq99yyKwKasIGDJcdhKHhc1FP GjTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Bk+eIMSQv+g5xCCaEFgobaj9D5mnn6TqG7iKGBAJ2J4=; b=RWmsJTvKgMhBxtGi1kmU4qqKWQB/kEbNQFEpqyPaPbI91OyyWfqqaOFE/1krv9kwFE Zj6cQ1VgDOD2Ufdd6X6bvlzz/zPHwu4FvakLUdNCBanLJ0cVv19sA65ir6vn9xeI7Pq7 zohj8IbFpd9zlnBmEEewUMSQC3QfsEH6oNR6f/3NMNU0NIwarqN2aa/aHEBKVhPNyK68 1yzTn7ld4Xjte2w1RQR4EWBAOMmpHhTdLsB16CGP8J8ECYckMaPa/ggEsjLcPocceSMI 73/PQQUIOFOBX4Aoi1WEql+EV8aewLPJr6HNJSc9YJRoim1XujGen0Q6SugMJfcFmvZO lnvA== X-Gm-Message-State: AOUpUlGNSrBA4j2vwgzb6x8UtCyxzo4cD/mB6Dw6kvAZdyhPrKF99yA0 F98WnlX6XoI0h7nwuzNhSUIfGzvf X-Google-Smtp-Source: AA+uWPwNWW1CLugTEfWAStVJFkmhYAlDGhi+JTQpo1wNlQEbDPM+YfxejvFPNm//n6SDKDcZnUcq6w== X-Received: by 2002:a17:902:6845:: with SMTP id f5-v6mr4141707pln.17.1534532592665; Fri, 17 Aug 2018 12:03:12 -0700 (PDT) Received: from dfrey-debian-linux.sierrawireless.local ([185.153.179.9]) by smtp.gmail.com with ESMTPSA id z22-v6sm6491358pgc.67.2018.08.17.12.03.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Aug 2018 12:03:11 -0700 (PDT) From: David Frey To: linux-iio@vger.kernel.org Cc: jic23@kernel.org, himanshujha199640@gmail.com, David Frey Subject: [PATCH v3 7/7] iio: chemical: bme680: simplify oversampling handling Date: Fri, 17 Aug 2018 12:03:19 -0700 Message-Id: <20180817190319.13119-8-dpfrey@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180817190319.13119-1-dpfrey@gmail.com> References: <20180817190319.13119-1-dpfrey@gmail.com> Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Temperature, pressure and humidity all expose and oversampling setting that works in the same way. Provide common handling for the oversampling sysfs attributes. Signed-off-by: David Frey Reviewed-by: Himanshu Jha Tested-by: Himanshu Jha --- drivers/iio/chemical/bme680_core.c | 99 ++++++++++++++------------------------ 1 file changed, 36 insertions(+), 63 deletions(-) diff --git a/drivers/iio/chemical/bme680_core.c b/drivers/iio/chemical/bme680_core.c index 46afc93041f5..30614ef043ca 100644 --- a/drivers/iio/chemical/bme680_core.c +++ b/drivers/iio/chemical/bme680_core.c @@ -91,8 +91,6 @@ static const struct iio_chan_spec bme680_channels[] = { }, }; -static const int bme680_oversampling_avail[] = { 1, 2, 4, 8, 16 }; - static int bme680_read_calib(struct bme680_data *data, struct bme680_calib *calib) { @@ -503,12 +501,20 @@ static int bme680_set_mode(struct bme680_data *data, bool mode) return ret; } +static u8 bme680_oversampling_to_reg(u8 val) +{ + return ilog2(val) + 1; +} + static int bme680_chip_config(struct bme680_data *data) { struct device *dev = regmap_get_device(data->regmap); int ret; - u8 osrs = FIELD_PREP(BME680_OSRS_HUMIDITY_MASK, - data->oversampling_humid + 1); + u8 osrs; + + osrs = FIELD_PREP( + BME680_OSRS_HUMIDITY_MASK, + bme680_oversampling_to_reg(data->oversampling_humid)); /* * Highly recommended to set oversampling of humidity before * temperature/pressure oversampling. @@ -529,12 +535,12 @@ static int bme680_chip_config(struct bme680_data *data) return ret; } - osrs = FIELD_PREP(BME680_OSRS_TEMP_MASK, data->oversampling_temp + 1) | - FIELD_PREP(BME680_OSRS_PRESS_MASK, data->oversampling_press + 1); - + osrs = FIELD_PREP(BME680_OSRS_TEMP_MASK, + bme680_oversampling_to_reg(data->oversampling_temp)) | + FIELD_PREP(BME680_OSRS_PRESS_MASK, + bme680_oversampling_to_reg(data->oversampling_press)); ret = regmap_write_bits(data->regmap, BME680_REG_CTRL_MEAS, - BME680_OSRS_TEMP_MASK | - BME680_OSRS_PRESS_MASK, + BME680_OSRS_TEMP_MASK | BME680_OSRS_PRESS_MASK, osrs); if (ret < 0) dev_err(dev, "failed to write ctrl_meas register\n"); @@ -767,13 +773,13 @@ static int bme680_read_raw(struct iio_dev *indio_dev, case IIO_CHAN_INFO_OVERSAMPLING_RATIO: switch (chan->type) { case IIO_TEMP: - *val = 1 << data->oversampling_temp; + *val = data->oversampling_temp; return IIO_VAL_INT; case IIO_PRESSURE: - *val = 1 << data->oversampling_press; + *val = data->oversampling_press; return IIO_VAL_INT; case IIO_HUMIDITYRELATIVE: - *val = 1 << data->oversampling_humid; + *val = data->oversampling_humid; return IIO_VAL_INT; default: return -EINVAL; @@ -783,52 +789,9 @@ static int bme680_read_raw(struct iio_dev *indio_dev, } } -static int bme680_write_oversampling_ratio_temp(struct bme680_data *data, - int val) -{ - int i; - - for (i = 0; i < ARRAY_SIZE(bme680_oversampling_avail); i++) { - if (bme680_oversampling_avail[i] == val) { - data->oversampling_temp = ilog2(val); - - return bme680_chip_config(data); - } - } - - return -EINVAL; -} - -static int bme680_write_oversampling_ratio_press(struct bme680_data *data, - int val) -{ - int i; - - for (i = 0; i < ARRAY_SIZE(bme680_oversampling_avail); i++) { - if (bme680_oversampling_avail[i] == val) { - data->oversampling_press = ilog2(val); - - return bme680_chip_config(data); - } - } - - return -EINVAL; -} - -static int bme680_write_oversampling_ratio_humid(struct bme680_data *data, - int val) +static bool bme680_is_valid_oversampling(int rate) { - int i; - - for (i = 0; i < ARRAY_SIZE(bme680_oversampling_avail); i++) { - if (bme680_oversampling_avail[i] == val) { - data->oversampling_humid = ilog2(val); - - return bme680_chip_config(data); - } - } - - return -EINVAL; + return (rate > 0 && rate <= 16 && is_power_of_2(rate)); } static int bme680_write_raw(struct iio_dev *indio_dev, @@ -842,16 +805,26 @@ static int bme680_write_raw(struct iio_dev *indio_dev, switch (mask) { case IIO_CHAN_INFO_OVERSAMPLING_RATIO: + { + if (!bme680_is_valid_oversampling(val)) + return -EINVAL; + switch (chan->type) { case IIO_TEMP: - return bme680_write_oversampling_ratio_temp(data, val); + data->oversampling_temp = val; + break; case IIO_PRESSURE: - return bme680_write_oversampling_ratio_press(data, val); + data->oversampling_press = val; + break; case IIO_HUMIDITYRELATIVE: - return bme680_write_oversampling_ratio_humid(data, val); + data->oversampling_humid = val; + break; default: return -EINVAL; } + + return bme680_chip_config(data); + } default: return -EINVAL; } @@ -913,9 +886,9 @@ int bme680_core_probe(struct device *dev, struct regmap *regmap, indio_dev->modes = INDIO_DIRECT_MODE; /* default values for the sensor */ - data->oversampling_humid = ilog2(2); /* 2X oversampling rate */ - data->oversampling_press = ilog2(4); /* 4X oversampling rate */ - data->oversampling_temp = ilog2(8); /* 8X oversampling rate */ + data->oversampling_humid = 2; /* 2X oversampling rate */ + data->oversampling_press = 4; /* 4X oversampling rate */ + data->oversampling_temp = 8; /* 8X oversampling rate */ data->heater_temp = 320; /* degree Celsius */ data->heater_dur = 150; /* milliseconds */