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;