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; }