From patchwork Wed Aug 15 20:38:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Frey X-Patchwork-Id: 10566817 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 37447921 for ; Wed, 15 Aug 2018 20:35:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC8F72ACA9 for ; Wed, 15 Aug 2018 20:35:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E0BE52B01E; Wed, 15 Aug 2018 20:35:33 +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 822122B006 for ; Wed, 15 Aug 2018 20:35:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726320AbeHOX3P (ORCPT ); Wed, 15 Aug 2018 19:29:15 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:34682 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726133AbeHOX3P (ORCPT ); Wed, 15 Aug 2018 19:29:15 -0400 Received: by mail-pf1-f195.google.com with SMTP id k19-v6so985223pfi.1; Wed, 15 Aug 2018 13:35:32 -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=uNtshA0HCEFGuXlzFD6OsFURv6Qw/qaR8rqP6ltgMRw=; b=oUiTSJ2XDeCgbb7zYhH+0BlmoNWLIuZPgClDX1x6NlGSKMHjw3FeLYhXzgw3S/IGVS SsK6VL7ZVI4XprNl7qKL9N6oRihV/1agsiJ9mJlLiHXPz7/fPNOtj7jLmtEUta6D5C+S dikaVNJ0N/uCPbUgk/FzWwFbxOsapWA0/grqzNwcBDIzsedrsVVp2ZPEStAMTUvzoqd0 9akTHAKxvEO9Cetoc6dLw/F/l43QlarAOBxs89eInx56/lXpE/a94YoAX6MKmDXkyZif iktTolHH8tc9H1oZlkCr5lFlsE2xTXGWBRjq06AlNdXsCSPSYNhMJZITOWCpnFu0e/K+ K93Q== 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=uNtshA0HCEFGuXlzFD6OsFURv6Qw/qaR8rqP6ltgMRw=; b=fo0PdZ8lY5l0GN3AZ42UYLJ12AyzhQ+7aAlHq0X7hdUpF9fYdr2OCiwUUeSm+nkYhF W49Xni/I5pX2iRxiyYUvTFMP+XOput7i17t159Tq+kYLYb2cEvgpeaky6FJlLLPw470F yXVg6tWnhUWvTu2PEbFTHL6KUt9d3a4ALHfgPFNp0WjM8kCq81jYzLx14cb6CHQbfSZP riE8vyybE6w2zXMICBzEJlh4XWD1yLZzAr2nX3TjHe4dTWQOvJrEORnNAAwCSyPH7wxO N1iqHThN9NFiyBjaY+hAOFGCJc4McvGKRjYAEcAlgKjs785Qjl0CRN8Vdt1s8g6NVsyb c8Ww== X-Gm-Message-State: AOUpUlFYmolMvbwBhFl9IFj7wTtvzY+Ki1f5p79S/BT7jBRxyQ+OYmx9 eb/X47u/Qtkwrr75YH70lTHbToLZ X-Google-Smtp-Source: AA+uWPw1RGrukPKeETFk9TLG1HRi2QA1hOSm24CMwFuapxtqYbnRY7poxpJBks4XF4leG1EWv4k6XQ== X-Received: by 2002:a63:a543:: with SMTP id r3-v6mr26458305pgu.336.1534365332062; Wed, 15 Aug 2018 13:35:32 -0700 (PDT) Received: from dfrey-debian-linux.sierrawireless.local ([185.153.179.9]) by smtp.gmail.com with ESMTPSA id d9-v6sm35784055pfb.86.2018.08.15.13.35.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Aug 2018 13:35:31 -0700 (PDT) From: David Frey To: linux-iio@vger.kernel.org Cc: jic23@vger.kernel.org, himanshujha199640@gmail.com, David Frey Subject: [PATCH v2 1/7] iio: chemical: bme680: use clamp macro Date: Wed, 15 Aug 2018 13:38:29 -0700 Message-Id: <20180815203835.21079-2-dpfrey@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180815203835.21079-1-dpfrey@gmail.com> References: <20180815203835.21079-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 --- 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 7d9bb62baa3f..b4c012bc0a82 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 Wed Aug 15 20:38:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Frey X-Patchwork-Id: 10566819 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 53DBD921 for ; Wed, 15 Aug 2018 20:35:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 153ED2ACA9 for ; Wed, 15 Aug 2018 20:35:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 09CFA2AE95; Wed, 15 Aug 2018 20:35:36 +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 9325F2ACA9 for ; Wed, 15 Aug 2018 20:35:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726525AbeHOX3S (ORCPT ); Wed, 15 Aug 2018 19:29:18 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:35140 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726133AbeHOX3R (ORCPT ); Wed, 15 Aug 2018 19:29:17 -0400 Received: by mail-pf1-f194.google.com with SMTP id p12-v6so985758pfh.2; Wed, 15 Aug 2018 13:35:34 -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=o3FvbyvVi7cEpDWV24YlJkTOlZtVGGoYhrbkjP0VIRA=; b=BpbvGpGvGVIZ4TLJS21nE8HXg/wBICiXH+8z0gy6EZ86nxIOV7Jelo3KIrJSvEbt0W lt8xFAlz6+kaHyn3kWcRhyqUQfGJFN8sB+NbRp9FDEqkv+Ye0XpzLa9YCnkw2rrDxv6P FPiojTtGwgpsM/avU4Fcwqzy3WxHoUCVlgvaJ04ko7a6oUU2mFmiPT+hF/bqecExcm2m iEX6VuQlBcJ6XpY+BgAUTQNNFZVFWNn7iYHo8p7KETdg0mdfYIAPkFR897/e4G5ajgmQ AV0cGA0rKSPXt3QLuqQGL+c8OfLMNLfxE5FDim7ICGq7VRK+FOx3dzWZBH6tMxBjcH+a wirw== 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=o3FvbyvVi7cEpDWV24YlJkTOlZtVGGoYhrbkjP0VIRA=; b=JdbAb3b0bH5+dmas+pxrtLshO8v3xHkAAx1vBLG989YU6UmD/a7BhGMy5YTo2KfuHv gY0aNFp7hzXAXsB5BRDEUa796pgr3MweVkJtsRQNZhYIex/VqJvfO6Hiz7F2E87BoA33 72DbOkE6HfnU4tEcZ058B0k5IArpp6MsZ5Q3Ku0EWBIbu+56XQbbtovjFvo5PWjDN0lH szNcGbzWYi91rKL8HxHQyYU8RChN3hy8RRrWFTk1hYsUBh9OL1FKcG3mWBbAhmWEoGxS pH0bvSdQAL1EIvIxLigsJWdr0UhnT0i+PDOJvaTC6lcxbkwGp93d+CtM421xvjZ3AAll kdSw== X-Gm-Message-State: AOUpUlG25hIX+7bSB9RH/5cBKRkyMZRfs5VEiKe2kS77/pDtcLPzLfzv XlfRjP+//CUg+GVyZ2vXceQdxfUl X-Google-Smtp-Source: AA+uWPxLIQz1OHczQmBxRrFFqm+bavpQ+MELemXArxcy/g6enqvNieRb5I+WrsiDTvr9QvzJ7qX9yQ== X-Received: by 2002:a62:ce05:: with SMTP id y5-v6mr29403329pfg.95.1534365333598; Wed, 15 Aug 2018 13:35:33 -0700 (PDT) Received: from dfrey-debian-linux.sierrawireless.local ([185.153.179.9]) by smtp.gmail.com with ESMTPSA id d9-v6sm35784055pfb.86.2018.08.15.13.35.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Aug 2018 13:35:32 -0700 (PDT) From: David Frey To: linux-iio@vger.kernel.org Cc: jic23@vger.kernel.org, himanshujha199640@gmail.com, David Frey Subject: [PATCH v2 2/7] iio: chemical: bme680: cleanup bme680_read_calib formatting Date: Wed, 15 Aug 2018 13:38:30 -0700 Message-Id: <20180815203835.21079-3-dpfrey@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180815203835.21079-1-dpfrey@gmail.com> References: <20180815203835.21079-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 --- 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 b4c012bc0a82..49bb6b84f181 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 Wed Aug 15 20:38:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Frey X-Patchwork-Id: 10566821 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 DB43714E1 for ; Wed, 15 Aug 2018 20:35:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9BFFE2ACA9 for ; Wed, 15 Aug 2018 20:35:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9053A2AE95; Wed, 15 Aug 2018 20:35:37 +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 40D3F2ACA9 for ; Wed, 15 Aug 2018 20:35:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726645AbeHOX3T (ORCPT ); Wed, 15 Aug 2018 19:29:19 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:41074 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726133AbeHOX3T (ORCPT ); Wed, 15 Aug 2018 19:29:19 -0400 Received: by mail-pf1-f193.google.com with SMTP id y10-v6so969271pfn.8; Wed, 15 Aug 2018 13:35:36 -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=eoa0JK6O2Jh5TdsWEiR7uKnjUEOfhx8k9lUuzNaw8+f3UikwDhGEly0/shPgzWj3IY MjVuqxDw4aQXf0sWC0jYmVbkrvT/SvqESW4XEyrE3XVWFkM7f1CWjJC0Anh9I4hyMBB1 VcEqwvg1KH9p+7WAX4cuR9bnPibS/hvnrwjgwONuA6D9g8TZwgvLcTmXu5pDASB2er86 uRT3wdCSvVX5kJuBfFGj3tnm6iYar8isQc+MwhzQOaWE5tIl+E1ZXIxH3C5tREfwNlfU DlumAwPCwDOALTUCHsnKwDeIrjsryQUlVmFP3nA6FYrTjFQ6y67YFlKoIuQ06zPUta5N pUXQ== 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=d0wLu6Rxm0o6gpc0YjHSawPpXFtRk1nmI2nK6w90QVLoouh5OzGSDLQntL5xXyCCmw TS3QL592TU1d1L4Hju1owRREu096Vmt3Qbo5vFu9DqXgSrxy4Y3idSsZT0vTtAAdR0Eh zoXSFz8mDg+t0iCyVWjANq5VGEnIpTXhpkDiw/9b3fNhVjvVYqbsYjXJiRD7QstEpDan oVqmolthfXnsehwW9XBu8u4Vs0kIxnI/1LIeeB6QhJB0+5mViZC1w871LPqORtAwZRRF 6p7/rkv6qU1KBfqVWu1iF8gmx4po+JsKIO0iod5VQmmmuKACbi/DHA+n3NMznqXzW5xl 4ekQ== X-Gm-Message-State: AOUpUlHBDw9jgJvbBk8GW5Gd2i5oj7C+9JylfP/1odi70/95JB9MRD/b tpYtgW/FCgNwutqoOtdY24rFQ9kZ X-Google-Smtp-Source: AA+uWPy6sX6NQpg8BvyFuo/3qeRxMSCTm+n0h3eHcWxA7uPrgsxJ89lPSH9iNfK5zn6I3ymDVGJevg== X-Received: by 2002:a63:eb0e:: with SMTP id t14-v6mr26130888pgh.198.1534365335444; Wed, 15 Aug 2018 13:35:35 -0700 (PDT) Received: from dfrey-debian-linux.sierrawireless.local ([185.153.179.9]) by smtp.gmail.com with ESMTPSA id d9-v6sm35784055pfb.86.2018.08.15.13.35.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Aug 2018 13:35:34 -0700 (PDT) From: David Frey To: linux-iio@vger.kernel.org Cc: jic23@vger.kernel.org, himanshujha199640@gmail.com, David Frey Subject: [PATCH v2 3/7] iio: chemical: bme680: indent #defines consistently Date: Wed, 15 Aug 2018 13:38:31 -0700 Message-Id: <20180815203835.21079-4-dpfrey@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180815203835.21079-1-dpfrey@gmail.com> References: <20180815203835.21079-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 --- 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 Wed Aug 15 20:38:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Frey X-Patchwork-Id: 10566823 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 7E32314E1 for ; Wed, 15 Aug 2018 20:35:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E8312ACA9 for ; Wed, 15 Aug 2018 20:35:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32B282AE95; Wed, 15 Aug 2018 20:35:39 +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 D212B2ACA9 for ; Wed, 15 Aug 2018 20:35:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726763AbeHOX3V (ORCPT ); Wed, 15 Aug 2018 19:29:21 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:36628 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726133AbeHOX3V (ORCPT ); Wed, 15 Aug 2018 19:29:21 -0400 Received: by mail-pg1-f193.google.com with SMTP id h12-v6so998438pgs.3; Wed, 15 Aug 2018 13:35:37 -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=W7odrrwAzz4H8oXKTrCkGyZqH5/DBmPvrYOcij/NnHg=; b=HSkJyajzcsPFKqjUC6ClX1j4g4OjxfJ1SZmsIfqx6vOYpHJyWd/1WvP80K0AbNHH5R 84qdtFpDORT08cpwbrFycd5K2wB0V2wgEP78zilTXPOl9v5j8USTWumuH9vKr3Lft2s8 cLSEyTzRwzV77LT46HvghpOgzBn49Q4cDbu2rBGDcad3oXl5y76UWVCEQA0+xtg2MMSA R+15qCRBcbJhNLvUkcEBcYort4HI3cGvxdW3zxsDsDQQ65vuF2yP2wQjY6meDHXEX0bH UhW3orv1FtKUICnhcgak8O0VJ3Ox3Fn3T7Few0WsVK0v2EGFd0YWOAqNhmBvaPeHNIkr IvTg== 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=W7odrrwAzz4H8oXKTrCkGyZqH5/DBmPvrYOcij/NnHg=; b=oAvozf8HviO26uy1uto3aWUqbfNubqsRWrjRzGQ5GKW4dgkwK1BQgHlEte5eP8G/L0 7FFKVTqGL6gBq6rfqxZVcxsiajasxrLeV8fMLa0csylYSP4ZSlLGEcHEudhnIaZ74fox Fc4egR9sEeI7u2He5ZR4PmGiYP+0VDWqmdOihO6YImsyA0HhmSj8eDS4xz1xsE4x2QU9 3S4mVe0G9KWPxFS+dpdutXoFM9ecSBx3vvn9WqkylT5RdZMNSd86ZZdRKINkNDsDyOX7 i1IWWEWFE3GJBAXHHeEoQE4dB7/YeEw8d6Gr+fYcXRihKt5Qbs/8WJrCuoFEwYHsJuk4 OhVw== X-Gm-Message-State: AOUpUlHB/6ab4R2Ym8LUvnpUoMHkTpv3njYhOCXCXRXYG2w+IDz45HUg Sz+bPy63HuwXJiqI4dP/DHNrWvKW X-Google-Smtp-Source: AA+uWPx/36/Ft8tie/bfn/hdL25dyndX+uceANIriL0Duiz+eW2fewUYcLNIze6kXgyqUvmty+Mb5g== X-Received: by 2002:a65:4304:: with SMTP id j4-v6mr27086146pgq.109.1534365337036; Wed, 15 Aug 2018 13:35:37 -0700 (PDT) Received: from dfrey-debian-linux.sierrawireless.local ([185.153.179.9]) by smtp.gmail.com with ESMTPSA id d9-v6sm35784055pfb.86.2018.08.15.13.35.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Aug 2018 13:35:36 -0700 (PDT) From: David Frey To: linux-iio@vger.kernel.org Cc: jic23@vger.kernel.org, himanshujha199640@gmail.com, David Frey Subject: [PATCH v2 4/7] iio: chemical: bme680: change MSK->MASK in #defines Date: Wed, 15 Aug 2018 13:38:32 -0700 Message-Id: <20180815203835.21079-5-dpfrey@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180815203835.21079-1-dpfrey@gmail.com> References: <20180815203835.21079-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 --- drivers/iio/chemical/bme680.h | 6 +++--- drivers/iio/chemical/bme680_core.c | 4 ++-- 2 files changed, 5 insertions(+), 5 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 49bb6b84f181..d62cb88af481 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_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 Wed Aug 15 20:38:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Frey X-Patchwork-Id: 10566825 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 919A5921 for ; Wed, 15 Aug 2018 20:35:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 51D082ACA9 for ; Wed, 15 Aug 2018 20:35:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 463012AE95; Wed, 15 Aug 2018 20:35:40 +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 F2E292ACA9 for ; Wed, 15 Aug 2018 20:35:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726995AbeHOX3W (ORCPT ); Wed, 15 Aug 2018 19:29:22 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:45647 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726133AbeHOX3W (ORCPT ); Wed, 15 Aug 2018 19:29:22 -0400 Received: by mail-pl0-f68.google.com with SMTP id j8-v6so943740pll.12; Wed, 15 Aug 2018 13:35:39 -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=mor46t2hcOwC3XDZcaPbaIJcMu8Y5JlQxHQiTEvmUSyc6v0d0QFJoAiXcw6ctI6R5B oIO8+m2bXruMEtecSc4Aa8IYH+ze04Mx4l4tvp+mZK6JucDO0xeAYaxcGW8TJAr1HobZ ISpVnmSWPE9SRwEIzwnsxDUKfzm+iVPEWmQ9boQDqNdiD4tvJXV37mJtRJKzhJplxa1D 19yR3/C/OjIQN6r85lmTk+zRg5AID0JHlhyV52dhj9NogvH+KcDWTuKnXGMtbtg60WFJ bAJt0kMPjmStpLDeWyrGgqr1+zB1bX2EWyScwkiTHywcNSImAlwQKC/92g8Nkfg0mQDD pqQQ== 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=NWvoe1yMD1RosYeMCEQTP7GbLA5RcGEL5/fs4KHZdCdpkjDzkFj104yT9+nWS7uYxh lOaYFjAroP2FcmSeWrwvIb7Ct3C7OMU1fRHO8VBCNRw9T+g901HYWUI0oUPpj7HAN/am 0K8kqY7M9ZbsRGh1ObG4uVPea1wLv9Ninv0KKKGlV6T/QfFA3mG+hwN/HUzTxhlrW7Jb 85+A5GpOK7tw90TtIfxYsXLozLVIcZ4oyqmTvHCc/lUvFNkf2kk2iG0ldw/xu2h7S4Fe pHvTxYGj5EBsm/8lLYvIfAwxs4yDKdRTwmfSZFvNsjFy6E+pqPxxYusMnogYmOm0Jv7r ncuQ== X-Gm-Message-State: AOUpUlGF8Ts2akrp+UJnogxas8BHeFqAa6i8tYxNw8ACwu87FAPIIRVT lN/v0bVtwZ7G6nywFAhx/kFTetX3 X-Google-Smtp-Source: AA+uWPxujxQDWxM/4kQ/zeukL9EHqZeivz0PhGJOZHlsWoVlHe1LkTnUnIYlFePN6LHGgkzqzWaFXQ== X-Received: by 2002:a17:902:d906:: with SMTP id c6-v6mr5354641plz.65.1534365338585; Wed, 15 Aug 2018 13:35:38 -0700 (PDT) Received: from dfrey-debian-linux.sierrawireless.local ([185.153.179.9]) by smtp.gmail.com with ESMTPSA id d9-v6sm35784055pfb.86.2018.08.15.13.35.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Aug 2018 13:35:37 -0700 (PDT) From: David Frey To: linux-iio@vger.kernel.org Cc: jic23@vger.kernel.org, himanshujha199640@gmail.com, David Frey Subject: [PATCH v2 5/7] iio: chemical: bme680: use GENMASK macro Date: Wed, 15 Aug 2018 13:38:33 -0700 Message-Id: <20180815203835.21079-6-dpfrey@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180815203835.21079-1-dpfrey@gmail.com> References: <20180815203835.21079-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 --- 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 Wed Aug 15 20:38:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Frey X-Patchwork-Id: 10566827 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 5C62914E1 for ; Wed, 15 Aug 2018 20:35:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C0E52ACA9 for ; Wed, 15 Aug 2018 20:35:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1063F2AE95; Wed, 15 Aug 2018 20:35:42 +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 B48472ACA9 for ; Wed, 15 Aug 2018 20:35:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727273AbeHOX3Y (ORCPT ); Wed, 15 Aug 2018 19:29:24 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:45647 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726133AbeHOX3Y (ORCPT ); Wed, 15 Aug 2018 19:29:24 -0400 Received: by mail-pl0-f65.google.com with SMTP id j8-v6so943767pll.12; Wed, 15 Aug 2018 13:35:40 -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=AK44yoKjkmP4QPzruZtsRIUollCXu93gsO7hU9ANqrs=; b=oIZFjDgGOo3pzgu+vE6x055vtRdB1SZAb/mvcUpof884DoTPb+pFabJGth9GwdwbjS s6s2t04lnduddgApRaszab8Vp3gJYAcj/Xek471qWOaNT+fg8t2lng1ZJk5SdSurQsPZ iXosgY8NE9BAB+/uZ5QD2mZNm7EeeVP4o1JBf9hUYdUG29mhEYf6eIqkHvMI+hf/mKno CgjUHam53EdnMs8L2QJxirH3SAoNcyLXlnAFwgW7KzU8smKDoZu82kleWdZGcc3o6aX0 3XWKzgwtusnSIKR4pc0GFZZdYqi9Zi3ejs6mrub3wTJMplUpI9rrF80g3j6AAr0tKBFg ywOQ== 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=AK44yoKjkmP4QPzruZtsRIUollCXu93gsO7hU9ANqrs=; b=nssjIwZrZ7MEP1ZcYjsr6WM0HxWP2Dmmrtg1rx1UR0RymwJPxrId1DyOpv8qW4uw9B MdNjmzlf9IVOdW4F+v2AGFYjCMCsa24cDIiWByRZoCINO9siL6arspBPOYW2qMyOsmLm Da/AxPJgHEpkpH4vMB4ebRFfWj6EuvMduW8+Lx8uOaauGIlaRbFGKifn1DbzKQRve2AP TsNViT03iKF6rmrvfrvgsBr4aK8WysIouiBNdGX12ewGzY8o2j3i5et7AoiznBPwcJQ/ GXiFG6ZZcsXPEqcZe9qOnqfSfsyAJ97CD0LU2x+igKVX98oPwBt9AD5lVhQpV7eKVewi 4UWw== X-Gm-Message-State: AOUpUlFBIGuzU+uYG/nVO6tjQAk8yufwrWwjRT6cGzDgx6aP631Tv5LD c2+799kJeuCVH2emp55Tx2NBECag X-Google-Smtp-Source: AA+uWPycZETylRl2ofdDWVg58nXMM2dMefM6BF0zGZ9WOKoX+adplHzFEXKFF3aoxLcxExTrVb7vbw== X-Received: by 2002:a17:902:9a83:: with SMTP id w3-v6mr25910518plp.75.1534365340077; Wed, 15 Aug 2018 13:35:40 -0700 (PDT) Received: from dfrey-debian-linux.sierrawireless.local ([185.153.179.9]) by smtp.gmail.com with ESMTPSA id d9-v6sm35784055pfb.86.2018.08.15.13.35.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Aug 2018 13:35:39 -0700 (PDT) From: David Frey To: linux-iio@vger.kernel.org Cc: jic23@vger.kernel.org, himanshujha199640@gmail.com, David Frey Subject: [PATCH v2 6/7] iio: chemical: bme680: use FIELD_GET macro Date: Wed, 15 Aug 2018 13:38:34 -0700 Message-Id: <20180815203835.21079-7-dpfrey@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180815203835.21079-1-dpfrey@gmail.com> References: <20180815203835.21079-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 --- 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 d62cb88af481..c96e4a991a61 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 Wed Aug 15 20:38:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Frey X-Patchwork-Id: 10566829 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 72B9B14E1 for ; Wed, 15 Aug 2018 20:35:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 325942ACA9 for ; Wed, 15 Aug 2018 20:35:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2483B2AE95; Wed, 15 Aug 2018 20:35:44 +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 9BA0B2ACA9 for ; Wed, 15 Aug 2018 20:35:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727321AbeHOX30 (ORCPT ); Wed, 15 Aug 2018 19:29:26 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:35146 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726133AbeHOX3Z (ORCPT ); Wed, 15 Aug 2018 19:29:25 -0400 Received: by mail-pl0-f66.google.com with SMTP id g1-v6so961773plo.2; Wed, 15 Aug 2018 13:35:42 -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=+dKG8xiv6F9rgbiTZ0M1SGqr2LyY1PO6ZacRuW2PL+8=; b=Bp78c9CnakZSOluYuCFOt+eE7YLZhxfhi71giBSmOJGp8JyVjCbIUzfjJ4XhhUT93B CpJK7EFiONzaIro1NsnXDXKU47IGkWoARrUEjHvyXgyPJgnl2gMeT9pSQpBbtpBEE4u/ FWMaLfEl4TexVf8MLjddRtRFQf6xNrzHkRBDdvCrvxqCvPTe0cWd4QYVNvgiMsIymJ9q Ef/BpvNyDp0fPF6zOeTR1dF9SAEO1OuMMEezoxKkSl+Q23nQ9T0O3ggB4X6ucqCvLvfn iZNAzAD9plFV53lQXWt0Ne7bNPywS2v9vOYKRga2e4Bnnbx1ZWvCB9UYMk7IOZ/FL+Io JPvQ== 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=+dKG8xiv6F9rgbiTZ0M1SGqr2LyY1PO6ZacRuW2PL+8=; b=eyMhWOBAHJhgYWvG4z6YLItWQFWwTgYWj4T3zFvc4EnjEP4+z6/TaHqVyhZc0JSBqK F6QJM7lDjkTtBBzRCNdfdFgda8Khavptad7/ySMfUYQkEmXQYbbd0abZ8tcakOpYXfLZ 6L016Xp2yn2sfxSB7pJjXXUj2TWtRPOe+3NKJOH5IMCD08X4prwD1hC4tSalnJXBwyz2 lLolBscfvTVbSP8NVBylHsDQnuSH9ypXT5kkTsBbXZep+XnkwPiKZnime8YwsAyCDf8Y GLf+FLE3v8k8X+FaMwracUhxe37Im7ZP+ubbxStCLe7UR1NM0Zu3ENPEZOv4tDB8CZPi j+6w== X-Gm-Message-State: AOUpUlGvqCIDPQKQGK8h3UWm27jKmts7ekQ6rr/oKr7ISmG8A6Ah5F5K FKRPTrGwsjjUv5Q6exDdO0hCI/5J X-Google-Smtp-Source: AA+uWPxGwVe+foarymsdRJuwgCqNgLUZwdxBiQ3gS4WJzAGz3b3Qoq+QM6nqCyRgcVflzIigwtodxw== X-Received: by 2002:a17:902:8d8c:: with SMTP id v12-v6mr25523989plo.94.1534365341833; Wed, 15 Aug 2018 13:35:41 -0700 (PDT) Received: from dfrey-debian-linux.sierrawireless.local ([185.153.179.9]) by smtp.gmail.com with ESMTPSA id d9-v6sm35784055pfb.86.2018.08.15.13.35.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Aug 2018 13:35:40 -0700 (PDT) From: David Frey To: linux-iio@vger.kernel.org Cc: jic23@vger.kernel.org, himanshujha199640@gmail.com, David Frey Subject: [PATCH v2 7/7] iio: chemical: bme680: simplify oversampling handling Date: Wed, 15 Aug 2018 13:38:35 -0700 Message-Id: <20180815203835.21079-8-dpfrey@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180815203835.21079-1-dpfrey@gmail.com> References: <20180815203835.21079-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 --- 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 c96e4a991a61..799389e8c0d9 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, @@ -839,16 +802,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; } @@ -910,9 +883,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 */