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