From patchwork Sat Sep 22 22:21:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10611579 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 AE3E514BD for ; Sat, 22 Sep 2018 22:21:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 994B82A8AF for ; Sat, 22 Sep 2018 22:21:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D68D2A8B6; Sat, 22 Sep 2018 22:21:15 +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 202AA2A8AF for ; Sat, 22 Sep 2018 22:21:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725825AbeIWEQV (ORCPT ); Sun, 23 Sep 2018 00:16:21 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:39606 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725726AbeIWEQV (ORCPT ); Sun, 23 Sep 2018 00:16:21 -0400 Received: by mail-wm1-f65.google.com with SMTP id q8-v6so6567183wmq.4 for ; Sat, 22 Sep 2018 15:21:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dfhHIe8UNJec1GUqaQIcyYpqpcsDwezyicppcO+0mPg=; b=ApXxuGSbLDjUPgbk3yHQlCcNmrBM3xsxJYO49feENRniD+Z2jf8FC0I+8M+JzF2+U8 qtBCf30jjSqKF680Hx7iYhUOWkguAThtfPfKS7kb8stV2FvkVsqCOWJuqPcA8N82z/jA 8ImKUZfuG3srOVUY9suCAQyW8AjslWveLEPPNHXmBXnLfq8EJtBnuj+VzSH8DZvgB+qc CfFWUmIpiBLlsj+lXtipsKrFQP2TgKKVdO7BZdu7YvbEhGTFBZMZsitE1nuHFJqjU4X8 mANDiyszE2wXDmyFmMWzch860vQ0ET4GroniAoLMiFFVNtdVXBw6TUxl0KEmDpbwKKGY 8sPw== 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:mime-version:content-transfer-encoding; bh=dfhHIe8UNJec1GUqaQIcyYpqpcsDwezyicppcO+0mPg=; b=gtmyi4I07EPTJpHYuBjaSSYWldXc0SX/Me9zNE/xz9jVBXSSHveWP/3Skzp8oNGwKi 9hQTce/rrrHghOnNYN6zhnh5i/QoLeBjUw+FCwVsTKVyHLEBINKBa5BAE8REomVHkLoX 76+X7IsScilMKjzR1Kq8C0yExGuN2IOm5sq8N3x+gZbT+7nN+JLm1jXSyrRlJiFAl6xv bJVTBXo+zPBOQqIXlsEjBduNu4iN4kLGwnrq/4nujjnk2th6Nv0AX4n6Nq6SPGqbdC3k J8yMaDcShoqT5orN1zD7F/VdB3nE3v3a71pSHUEde7Cc2k/dKiofXb95CF436J+EdrgW G6Sg== X-Gm-Message-State: APzg51AGFOHEU/vJO2dS2A+FD9IljggL5ZPWr3MTKC4fuRMEcMx0CEtT nMWb98BH5BnJ7S7vNozrl/U= X-Google-Smtp-Source: ANB0VdZlYa6NLbgF2B+EiNBaJcbTSSHCyX7uHm6T/VIkSqwTooihenmHA7unem++R92BOxlOZFE6Tw== X-Received: by 2002:a1c:b441:: with SMTP id d62-v6mr2587161wmf.17.1537654871542; Sat, 22 Sep 2018 15:21:11 -0700 (PDT) Received: from blackbox.darklights.net (p200300DCD74AC30035FEEB5F4EC70873.dip0.t-ipconnect.de. [2003:dc:d74a:c300:35fe:eb5f:4ec7:873]) by smtp.googlemail.com with ESMTPSA id l16-v6sm6395499wmc.38.2018.09.22.15.21.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Sep 2018 15:21:10 -0700 (PDT) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, linux-iio@vger.kernel.org Cc: jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, Martin Blumenstingl Subject: [PATCH 1/3] iio: adc: meson-saradc: remove #define MESON_SAR_ADC_DELTA_10_TS_C_SHIFT Date: Sun, 23 Sep 2018 00:21:00 +0200 Message-Id: <20180922222102.12023-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180922222102.12023-1-martin.blumenstingl@googlemail.com> References: <20180922222102.12023-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 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 This define is of no use because the driver is avoiding shifting bits by itself but using FIELD_GET/FIELD_PREP (which are using bit masks) instead. There is already a MESON_SAR_ADC_DELTA_10_TS_C_MASK bit mask so MESON_SAR_ADC_DELTA_10_TS_C_SHIFT was redundant. Signed-off-by: Martin Blumenstingl --- drivers/iio/adc/meson_saradc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index da2d16dfa63e..b97b06bf7713 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -148,7 +148,6 @@ #define MESON_SAR_ADC_DELTA_10_TS_REVE1 BIT(26) #define MESON_SAR_ADC_DELTA_10_CHAN1_DELTA_VALUE_MASK GENMASK(25, 16) #define MESON_SAR_ADC_DELTA_10_TS_REVE0 BIT(15) - #define MESON_SAR_ADC_DELTA_10_TS_C_SHIFT 11 #define MESON_SAR_ADC_DELTA_10_TS_C_MASK GENMASK(14, 11) #define MESON_SAR_ADC_DELTA_10_TS_VBG_EN BIT(10) #define MESON_SAR_ADC_DELTA_10_CHAN0_DELTA_VALUE_MASK GENMASK(9, 0) From patchwork Sat Sep 22 22:21:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10611577 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 C94BF17EE for ; Sat, 22 Sep 2018 22:21:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B81ED2A86B for ; Sat, 22 Sep 2018 22:21:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ACC5D2A8B4; Sat, 22 Sep 2018 22:21:15 +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 40C8D2A8B1 for ; Sat, 22 Sep 2018 22:21:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725853AbeIWEQW (ORCPT ); Sun, 23 Sep 2018 00:16:22 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:33935 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725822AbeIWEQV (ORCPT ); Sun, 23 Sep 2018 00:16:21 -0400 Received: by mail-wr1-f66.google.com with SMTP id t15so8188975wrx.1 for ; Sat, 22 Sep 2018 15:21:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9Y/Wt90wAd/Y1ZITzs1DmPar9yMuBvVA1vfA9vk8u1o=; b=MGARRO99WopYr6gDlzjZEJB9TS03oj78r6jouSBLiQoWUPFZnjfQ6DXujqEQQZDjYJ 9JmF+e2T+NlttKDBTxBKmSImX1r4K/Sgp+nse/qQ1Brfu8WCmCP9N9bz+2I32uQmL3fK KEJYf5BeTNQfLy1SfVf6cGiMPzmjT7bihw4k9zKXYCNV/yz9RNi1fhmWCl4SoLPPWrzM h5u/7wPH/L2EIwX+tl6ADAd7kUcuY9e3Q6Oucg7zYEob4NpY+M2vmKWLI5/DsHLU150c +IOSQUXpvsnwDrEkbOafu8I68lRoNOioK3cSv+WbvBfYoxe11rlBUzvab2Q+4fUs9Fqu /VDQ== 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:mime-version:content-transfer-encoding; bh=9Y/Wt90wAd/Y1ZITzs1DmPar9yMuBvVA1vfA9vk8u1o=; b=YNKGJYKrD9ibwjGxOV8KTtR53J4YFvEUBXUPBQcSYUjRq0UbpQCMH5wy4WkEPlha69 eCWBQYgCwRLghWHc55+JLblwS8HMpwLoBgARX0Ho14h/KctveP/o+hZaY8cNuoShIiH/ y7f8poH5QbugqLWmAR1q+8qQlYle622w6tT0SegxAmzqLwOM1d+UyElZeXVUl5NkU1u/ PPw5KP9GSfgO6Rn2FhogyVdJLwJNJTQvcuqgl3QGuoZMRpb03cufxxbVkGY76vBvFupZ S8EDnvEDNpw9bkEsSH3ik7TK0JJkn4lYU3aPNrR6rbNb+Rg2nKM/PbkZTEUm6KI+ULVN 5l2w== X-Gm-Message-State: ABuFfoidohFTFt/H74geHVFE/oWrhOL0lZy2HcteDduxmcil2MLr613I FUdo5fREzlhAe1VuFXLDB0c= X-Google-Smtp-Source: ACcGV60KCUAF2Xk4DIHLxQ/KYU+Pif17covgKUfA9ifgwQmH4vgu7ldUjJv2SVr9hw7bReY+eiqnKQ== X-Received: by 2002:adf:9c12:: with SMTP id f18-v6mr3229258wrc.93.1537654872777; Sat, 22 Sep 2018 15:21:12 -0700 (PDT) Received: from blackbox.darklights.net (p200300DCD74AC30035FEEB5F4EC70873.dip0.t-ipconnect.de. [2003:dc:d74a:c300:35fe:eb5f:4ec7:873]) by smtp.googlemail.com with ESMTPSA id l16-v6sm6395499wmc.38.2018.09.22.15.21.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Sep 2018 15:21:11 -0700 (PDT) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, linux-iio@vger.kernel.org Cc: jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, Martin Blumenstingl Subject: [PATCH 2/3] iio: adc: meson-saradc: use of_device_get_match_data Date: Sun, 23 Sep 2018 00:21:01 +0200 Message-Id: <20180922222102.12023-3-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180922222102.12023-1-martin.blumenstingl@googlemail.com> References: <20180922222102.12023-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 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 This simplifies our _probe function by using of_device_get_match_data instead of open-coding it. No functional changes. Signed-off-by: Martin Blumenstingl --- drivers/iio/adc/meson_saradc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index b97b06bf7713..9d8f2139debc 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -978,11 +978,11 @@ MODULE_DEVICE_TABLE(of, meson_sar_adc_of_match); static int meson_sar_adc_probe(struct platform_device *pdev) { + const struct meson_sar_adc_data *match_data; struct meson_sar_adc_priv *priv; struct iio_dev *indio_dev; struct resource *res; void __iomem *base; - const struct of_device_id *match; int irq, ret; indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); @@ -994,13 +994,13 @@ static int meson_sar_adc_probe(struct platform_device *pdev) priv = iio_priv(indio_dev); init_completion(&priv->done); - match = of_match_device(meson_sar_adc_of_match, &pdev->dev); - if (!match) { - dev_err(&pdev->dev, "failed to match device\n"); + match_data = of_device_get_match_data(&pdev->dev); + if (!match_data) { + dev_err(&pdev->dev, "failed to get match data\n"); return -ENODEV; } - priv->data = match->data; + priv->data = match_data; indio_dev->name = priv->data->name; indio_dev->dev.parent = &pdev->dev; From patchwork Sat Sep 22 22:21:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10611581 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 CCF2A14BD for ; Sat, 22 Sep 2018 22:21:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC8342A86B for ; Sat, 22 Sep 2018 22:21:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B0D572A8B1; Sat, 22 Sep 2018 22:21:17 +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 2A5AA2A86B for ; Sat, 22 Sep 2018 22:21:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725726AbeIWEQY (ORCPT ); Sun, 23 Sep 2018 00:16:24 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:39611 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725822AbeIWEQY (ORCPT ); Sun, 23 Sep 2018 00:16:24 -0400 Received: by mail-wm1-f68.google.com with SMTP id q8-v6so6567219wmq.4 for ; Sat, 22 Sep 2018 15:21:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5rgz25HDQtZ85/zPXPgNYfobxw8jeZ5e140Ni1THgpo=; b=gcRiGapIYsT9I/JRQWCRADIm16CAln7vnz3X/YsOPh+4IEmGGjJhdHq0aOssqDhO3/ z7KbcJReo3yO3whMUDj7TQvMVA2ay9AdYZ1klABBWbxKxEmIPaWHqqbbUu1Sjk9/Z2pe C1UaW/MSWw7HLerl9GSwzS4iNRkO4a8OxRhKB7s7blFoTpkG8FXSLI8FkyazS9GGzlhs fwcXeqb6AdOB8mxgkiHt1sgJ7QoF7Yit0vNAql30kgvHACuNiJ9qTgAdcA0H2KEjLmIn f7iB53StFrriToXeLZGwKswS+uXEB/xR1OIGP6UfjTSqmSGpWHCslWWdaBGpfGYgMib0 mMZw== 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:mime-version:content-transfer-encoding; bh=5rgz25HDQtZ85/zPXPgNYfobxw8jeZ5e140Ni1THgpo=; b=abFwUccSJXyXZ1nn+8PfKbJ3L251s/3W8thxunXLPPepBTIynbdvs+FKx07f77u17Y YHISC/2Q7ZpIe2ZCIAouC+YZK8F+JPSkYduxnInV2BfuajTbh2YtuEqOZd/6ueEMYQJL ZiriitYe0vjwQY3giCYqCZ1pkIgLtX2tW1sdc5/O2cJRED27sM6o9fN9BVmxtfGYkR5o ++oEmFXa1xpASPN5Yey1nEz7n6VWlugqqDRm7DFTMSfzIDauCud5PUGY4ot5jWnLs33R kwQX+193CmmcZ3ObXHCZH3ra53cg7OI2AZ+QZ5mpIcggWDU/PGC40smkyy/SQZiUVHJE 43Cw== X-Gm-Message-State: ABuFfogO+nap8dnJnarIuIeitc3gL2X1skTgl5qd96Gk9ESh062Eujr5 ksawfbS1DNEpKQl+V5WAvXU= X-Google-Smtp-Source: ANB0VdYU1/ttBlC9AHGbSnjNnoIIcg8wiquGCmSSHUoCsNQhQr03dYGYGnxkglSxm/3YiAbjHQUX/Q== X-Received: by 2002:a1c:9215:: with SMTP id u21-v6mr2474545wmd.106.1537654873854; Sat, 22 Sep 2018 15:21:13 -0700 (PDT) Received: from blackbox.darklights.net (p200300DCD74AC30035FEEB5F4EC70873.dip0.t-ipconnect.de. [2003:dc:d74a:c300:35fe:eb5f:4ec7:873]) by smtp.googlemail.com with ESMTPSA id l16-v6sm6395499wmc.38.2018.09.22.15.21.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Sep 2018 15:21:13 -0700 (PDT) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, linux-iio@vger.kernel.org Cc: jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, Martin Blumenstingl Subject: [PATCH 3/3] iio: adc: meson-saradc: simplify access to meson_sar_adc_param Date: Sun, 23 Sep 2018 00:21:02 +0200 Message-Id: <20180922222102.12023-4-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180922222102.12023-1-martin.blumenstingl@googlemail.com> References: <20180922222102.12023-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 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 Commit 053ffe3c8cfe31 ("iio: adc: meson-saradc: squash and share the common adc platform data") put all the data which is needed at runtime from struct meson_sar_adc_data to a new struct meson_sar_adc_param so we can re-use the platform specific configuration without having to duplicate everything just to change the name. The only place where struct meson_sar_adc_data is now needed is the _probe function which has to pass the name to the iio_dev. All other functions only need access to struct meson_sar_adc_param. This means we can simplify struct meson_sar_adc_priv. The goal of this patch is to make the code a bit easier to read since this removes one level of nesting. No functional changes intended. Signed-off-by: Martin Blumenstingl --- drivers/iio/adc/meson_saradc.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index 9d8f2139debc..1c4ba83c0725 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -234,7 +234,7 @@ struct meson_sar_adc_data { struct meson_sar_adc_priv { struct regmap *regmap; struct regulator *vref; - const struct meson_sar_adc_data *data; + const struct meson_sar_adc_param *param; struct clk *clkin; struct clk *core_clk; struct clk *adc_sel_clk; @@ -279,7 +279,7 @@ static int meson_sar_adc_calib_val(struct iio_dev *indio_dev, int val) /* use val_calib = scale * val_raw + offset calibration function */ tmp = div_s64((s64)val * priv->calibscale, MILLION) + priv->calibbias; - return clamp(tmp, 0, (1 << priv->data->param->resolution) - 1); + return clamp(tmp, 0, (1 << priv->param->resolution) - 1); } static int meson_sar_adc_wait_busy_clear(struct iio_dev *indio_dev) @@ -331,7 +331,7 @@ static int meson_sar_adc_read_raw_sample(struct iio_dev *indio_dev, } fifo_val = FIELD_GET(MESON_SAR_ADC_FIFO_RD_SAMPLE_VALUE_MASK, regval); - fifo_val &= GENMASK(priv->data->param->resolution - 1, 0); + fifo_val &= GENMASK(priv->param->resolution - 1, 0); *val = meson_sar_adc_calib_val(indio_dev, fifo_val); return 0; @@ -450,7 +450,7 @@ static int meson_sar_adc_lock(struct iio_dev *indio_dev) mutex_lock(&indio_dev->mlock); - if (priv->data->param->has_bl30_integration) { + if (priv->param->has_bl30_integration) { /* prevent BL30 from using the SAR ADC while we are using it */ regmap_update_bits(priv->regmap, MESON_SAR_ADC_DELAY, MESON_SAR_ADC_DELAY_KERNEL_BUSY, @@ -478,7 +478,7 @@ static void meson_sar_adc_unlock(struct iio_dev *indio_dev) { struct meson_sar_adc_priv *priv = iio_priv(indio_dev); - if (priv->data->param->has_bl30_integration) + if (priv->param->has_bl30_integration) /* allow BL30 to use the SAR ADC again */ regmap_update_bits(priv->regmap, MESON_SAR_ADC_DELAY, MESON_SAR_ADC_DELAY_KERNEL_BUSY, 0); @@ -562,7 +562,7 @@ static int meson_sar_adc_iio_info_read_raw(struct iio_dev *indio_dev, } *val = ret / 1000; - *val2 = priv->data->param->resolution; + *val2 = priv->param->resolution; return IIO_VAL_FRACTIONAL_LOG2; case IIO_CHAN_INFO_CALIBBIAS: @@ -635,7 +635,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) */ meson_sar_adc_set_chan7_mux(indio_dev, CHAN7_MUX_CH7_INPUT); - if (priv->data->param->has_bl30_integration) { + if (priv->param->has_bl30_integration) { /* * leave sampling delay and the input clocks as configured by * BL30 to make sure BL30 gets the values it expects when @@ -715,7 +715,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) return ret; } - ret = clk_set_rate(priv->adc_clk, priv->data->param->clock_rate); + ret = clk_set_rate(priv->adc_clk, priv->param->clock_rate); if (ret) { dev_err(indio_dev->dev.parent, "failed to set adc clock rate\n"); @@ -728,7 +728,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) static void meson_sar_adc_set_bandgap(struct iio_dev *indio_dev, bool on_off) { struct meson_sar_adc_priv *priv = iio_priv(indio_dev); - const struct meson_sar_adc_param *param = priv->data->param; + const struct meson_sar_adc_param *param = priv->param; u32 enable_mask; if (param->bandgap_reg == MESON_SAR_ADC_REG11) @@ -848,8 +848,8 @@ static int meson_sar_adc_calib(struct iio_dev *indio_dev) int ret, nominal0, nominal1, value0, value1; /* use points 25% and 75% for calibration */ - nominal0 = (1 << priv->data->param->resolution) / 4; - nominal1 = (1 << priv->data->param->resolution) * 3 / 4; + nominal0 = (1 << priv->param->resolution) / 4; + nominal1 = (1 << priv->param->resolution) * 3 / 4; meson_sar_adc_set_chan7_mux(indio_dev, CHAN7_MUX_VDD_DIV4); usleep_range(10, 20); @@ -1000,9 +1000,9 @@ static int meson_sar_adc_probe(struct platform_device *pdev) return -ENODEV; } - priv->data = match_data; + priv->param = match_data->param; - indio_dev->name = priv->data->name; + indio_dev->name = match_data->name; indio_dev->dev.parent = &pdev->dev; indio_dev->dev.of_node = pdev->dev.of_node; indio_dev->modes = INDIO_DIRECT_MODE; @@ -1026,7 +1026,7 @@ static int meson_sar_adc_probe(struct platform_device *pdev) return ret; priv->regmap = devm_regmap_init_mmio(&pdev->dev, base, - priv->data->param->regmap_config); + priv->param->regmap_config); if (IS_ERR(priv->regmap)) return PTR_ERR(priv->regmap);