From patchwork Tue Aug 22 19:22:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 715854 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE702EE49AE for ; Tue, 22 Aug 2023 19:20:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230108AbjHVTUt (ORCPT ); Tue, 22 Aug 2023 15:20:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229683AbjHVTUs (ORCPT ); Tue, 22 Aug 2023 15:20:48 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1790CCF2; Tue, 22 Aug 2023 12:20:46 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-50078eba7afso4639245e87.0; Tue, 22 Aug 2023 12:20:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692732044; x=1693336844; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+QPTswzEs0NNaPACSXZZFvzNW7C4lCRixzMkQxkaQC0=; b=Q0v5mcTuQSZJQ7OlvA90SwF2A7EREA9Z49DboMu/yPsK0ypNiom6ET8b1drqP7PdrU V5V1zqZP3lqLHgffY/gJKaDGSS4xX9lMY5EA3+CaJsEHXT2I+8StsQLLouxw+OfTiGK/ LNQQG1jH/e85U6QiWTmw8vT6Z7v42CtvVtiDRkKQannk/YVQaaskamcoCBcmDkoh1AEe X0+0lDWbRsGRSUVqhJXR2yd5gT1VqlqbYKoHFYP2jZFjKC7TDBBG5F16Rfgwh6Q9yb7y 579UjdaN/1L7gW06TPhoeHqzEK/K9Zr5BWW8uJxZtd1nX5jjVxg61RTalrxkOcWIAv2Q DjvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692732044; x=1693336844; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+QPTswzEs0NNaPACSXZZFvzNW7C4lCRixzMkQxkaQC0=; b=YQ/x0QhxxsZd8T2IlQ+L/EF54kWNBoi+VVUPygFhQaF4QNL9huewx1bWlhffYlsSdl 0AJW0Jfw1vOCq0CrdtbsngzCMKeAmj7MNCZz4t8P4BOY2qpOQKGChs6k5QW4D9qEZjEC YamfLGMuyPlnlsvlbrcriiqPCYsM6Sse+LLp1O1w3mSvrWQxP60O25Z678Hoocfc9rk/ C3NWzeMsNAtZrzSfecon9kP11DqT0k2K/EqdNOr14/ELx8FCHnMQfhW6SJE24z+HcgFB wOI54cv34Z+t7uWR6H6Lx1huaBbPthsXTT5qCXF5pfuYqhssuQ4+D9FsV6AhNWJlYnuA 4KzA== X-Gm-Message-State: AOJu0Yyq5kC0leqzfXRVjytqDaVzGbM6W6Q/BOmq6gsV4k5ekMz3rPwi dxX9TjSPT47E78uAwcif740= X-Google-Smtp-Source: AGHT+IEdtvULRKNfebeNEnXdyEkgVLnvGQZU/vhy9/JaEsjv7A8lCVzQNFlAvOoj/3MQkqwf5guWZQ== X-Received: by 2002:a05:6512:3988:b0:500:7e70:ddee with SMTP id j8-20020a056512398800b005007e70ddeemr6757032lfu.8.1692732044102; Tue, 22 Aug 2023 12:20:44 -0700 (PDT) Received: from localhost.localdomain (83-233-6-197.cust.bredband2.com. [83.233.6.197]) by smtp.gmail.com with ESMTPSA id b12-20020ac2410c000000b004fe89735f1asm450586lfi.34.2023.08.22.12.20.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 12:20:42 -0700 (PDT) From: Marcus Folkesson To: Marcus Folkesson , Kent Gustavsson , Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andy Shevchenko , Cosmin Tanislav , Arnd Bergmann , ChiYuan Huang , Haibo Chen , Ramona Bolboaca , Ibrahim Tilki , ChiaEn Wu , William Breathitt Gray Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski Subject: [PATCH v8 1/6] dt-bindings: iio: adc: mcp3911: add support for the whole MCP39xx family Date: Tue, 22 Aug 2023 21:22:54 +0200 Message-ID: <20230822192259.1125792-2-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822192259.1125792-1-marcus.folkesson@gmail.com> References: <20230822192259.1125792-1-marcus.folkesson@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Microchip does have many similar chips, add those to the compatible string as the driver support is extended. The new supported chips are: - microchip,mcp3910 - microchip,mcp3912 - microchip,mcp3913 - microchip,mcp3914 - microchip,mcp3918 - microchip,mcp3919 Signed-off-by: Marcus Folkesson Reviewed-by: Krzysztof Kozlowski --- Notes: v2: - No changes v3: - No changes v4: - No changes v5: - No changes v6: - No changes v7: - No changes v8: - No changes .../devicetree/bindings/iio/adc/microchip,mcp3911.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/iio/adc/microchip,mcp3911.yaml b/Documentation/devicetree/bindings/iio/adc/microchip,mcp3911.yaml index f7b3fde4115a..06951ec5f5da 100644 --- a/Documentation/devicetree/bindings/iio/adc/microchip,mcp3911.yaml +++ b/Documentation/devicetree/bindings/iio/adc/microchip,mcp3911.yaml @@ -18,7 +18,13 @@ description: | properties: compatible: enum: + - microchip,mcp3910 - microchip,mcp3911 + - microchip,mcp3912 + - microchip,mcp3913 + - microchip,mcp3914 + - microchip,mcp3918 + - microchip,mcp3919 reg: maxItems: 1 From patchwork Tue Aug 22 19:22:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 715853 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5529BEE49B1 for ; Tue, 22 Aug 2023 19:20:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230122AbjHVTUz (ORCPT ); Tue, 22 Aug 2023 15:20:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229683AbjHVTUy (ORCPT ); Tue, 22 Aug 2023 15:20:54 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81E47CED; Tue, 22 Aug 2023 12:20:49 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-5008d16cc36so1763215e87.2; Tue, 22 Aug 2023 12:20:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692732048; x=1693336848; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3j6YILAEdpS7c1O+6uU56aDwuQFP7ZGqwMIdYbVPfe8=; b=KTnSttJ/d+bBSa7+DVSi/g6mC5DZR6ZV6bZs3IYO7L88F64fOyzPjq0XAMEI2rzlZn C1vU46uPYbtg0NvWGzOhj+U6ENPK+GnXPLxb9nLlcfMfGlAuEhbnXGqgZa8W3SyrduZX ef/khiFZ1O92hNJ8tWoNtw3Y444gzusPKfhw/iWYDRHoDqJROPwM0pY0XVMIMpR6S1K5 2zmEvB4zE2/YJMQUyXlA7NeZ7XLKyNVZ6hTfkAMxF/fVT5g/Y8li3VKZcG8unVO46JmA dt0P0etMm8ti5pfEuIj7JAfws177C9Qa/9fhg1hy/Op00o4I7Pt6X+6/7HgIbgYlwD1g iLsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692732048; x=1693336848; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3j6YILAEdpS7c1O+6uU56aDwuQFP7ZGqwMIdYbVPfe8=; b=HPt/HpY7DDsMjnfEFsM5kUsUtrydsWiPPzj0UZeTDDPhgWkqBBa65MF0jIG1Q76l31 2OY4GEYy0Ku++/TYHWIx1pm2N6L9q/PBEon24HRcyPL0wC26TZXXCpSXxoAr8KVFuzmP ltiguktMHRLt5F3PSRQ/WLUco9RurdBJNtneK6ZPQPFwpQAZpZNZuRW7+w1uPwW9Uojo nXtEfDK+zki+tApuGNR1TowBq8VBs/lYqN2wV69Qr23rl6KuGFEfkIt+xClX4V1rYjQa 7T3pLnnYEkomfCoIw3u010Avn4RZs2HLELflRtg0hdgSgFe6ibU6tXf6ZO9l2xOSORSc 2eKw== X-Gm-Message-State: AOJu0YzU7pctfPh1Pqc5L8ikyHhiMJj3BB+VilwvA+74U8lU5eIXBurs yglWzqe3NKv2/46lpysB5VQ= X-Google-Smtp-Source: AGHT+IF1CgGh45IS4GoPHp1flMqVh0+m8729aIuuuU5e91/tzN/uY4flx02TUe/Gb8e+Qlex27PftA== X-Received: by 2002:a05:6512:1095:b0:4ff:8cd2:633a with SMTP id j21-20020a056512109500b004ff8cd2633amr8212831lfg.30.1692732047411; Tue, 22 Aug 2023 12:20:47 -0700 (PDT) Received: from localhost.localdomain (83-233-6-197.cust.bredband2.com. [83.233.6.197]) by smtp.gmail.com with ESMTPSA id b12-20020ac2410c000000b004fe89735f1asm450586lfi.34.2023.08.22.12.20.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 12:20:46 -0700 (PDT) From: Marcus Folkesson To: Marcus Folkesson , Kent Gustavsson , Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andy Shevchenko , Cosmin Tanislav , Arnd Bergmann , ChiYuan Huang , Haibo Chen , Ramona Bolboaca , Ibrahim Tilki , ChiaEn Wu , William Breathitt Gray Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 3/6] iio: adc: mcp3911: simplify usage of spi->dev Date: Tue, 22 Aug 2023 21:22:56 +0200 Message-ID: <20230822192259.1125792-4-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822192259.1125792-1-marcus.folkesson@gmail.com> References: <20230822192259.1125792-1-marcus.folkesson@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Replace the usage of `adc->spi->dev` with `dev` to make the code prettier. Reviewed-by: Andy Shevchenko Suggested-by: Andy Shevchenko Signed-off-by: Marcus Folkesson --- Notes: v4: - New patch in this series v5: - Introduce `struct device *dev` to more functions v6: - cosmetics v7: - compress some calls to two lines v8: - No changes drivers/iio/adc/mcp3911.c | 50 ++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c index 7fb3ab4a4256..31ee8d7f81de 100644 --- a/drivers/iio/adc/mcp3911.c +++ b/drivers/iio/adc/mcp3911.c @@ -269,6 +269,7 @@ static int mcp3911_write_raw(struct iio_dev *indio_dev, static int mcp3911_calc_scale_table(struct mcp3911 *adc) { + struct device *dev = &adc->spi->dev; u32 ref = MCP3911_INT_VREF_MV; u32 div; int ret; @@ -277,7 +278,7 @@ static int mcp3911_calc_scale_table(struct mcp3911 *adc) if (adc->vref) { ret = regulator_get_voltage(adc->vref); if (ret < 0) { - return dev_err_probe(&adc->spi->dev, ret, "failed to get vref voltage\n"); + return dev_err_probe(dev, ret, "failed to get vref voltage\n"); } ref = ret / 1000; @@ -334,6 +335,7 @@ static irqreturn_t mcp3911_trigger_handler(int irq, void *p) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct mcp3911 *adc = iio_priv(indio_dev); + struct device *dev = &adc->spi->dev; struct spi_transfer xfer[] = { { .tx_buf = &adc->tx_buf, @@ -351,8 +353,7 @@ static irqreturn_t mcp3911_trigger_handler(int irq, void *p) adc->tx_buf = MCP3911_REG_READ(MCP3911_CHANNEL(0), adc->dev_addr); ret = spi_sync_transfer(adc->spi, xfer, ARRAY_SIZE(xfer)); if (ret < 0) { - dev_warn(&adc->spi->dev, - "failed to get conversion data\n"); + dev_warn(dev, "failed to get conversion data\n"); goto out; } @@ -397,7 +398,7 @@ static int mcp3911_config(struct mcp3911 *adc) "invalid device address (%i). Must be in range 0-3.\n", adc->dev_addr); } - dev_dbg(&adc->spi->dev, "use device address %i\n", adc->dev_addr); + dev_dbg(dev, "use device address %i\n", adc->dev_addr); ret = mcp3911_read(adc, MCP3911_REG_CONFIG, ®val, 2); if (ret) @@ -405,21 +406,19 @@ static int mcp3911_config(struct mcp3911 *adc) regval &= ~MCP3911_CONFIG_VREFEXT; if (adc->vref) { - dev_dbg(&adc->spi->dev, "use external voltage reference\n"); + dev_dbg(dev, "use external voltage reference\n"); regval |= FIELD_PREP(MCP3911_CONFIG_VREFEXT, 1); } else { - dev_dbg(&adc->spi->dev, - "use internal voltage reference (1.2V)\n"); + dev_dbg(dev, "use internal voltage reference (1.2V)\n"); regval |= FIELD_PREP(MCP3911_CONFIG_VREFEXT, 0); } regval &= ~MCP3911_CONFIG_CLKEXT; if (adc->clki) { - dev_dbg(&adc->spi->dev, "use external clock as clocksource\n"); + dev_dbg(dev, "use external clock as clocksource\n"); regval |= FIELD_PREP(MCP3911_CONFIG_CLKEXT, 1); } else { - dev_dbg(&adc->spi->dev, - "use crystal oscillator as clocksource\n"); + dev_dbg(dev, "use crystal oscillator as clocksource\n"); regval |= FIELD_PREP(MCP3911_CONFIG_CLKEXT, 0); } @@ -467,14 +466,14 @@ static int mcp3911_probe(struct spi_device *spi) struct mcp3911 *adc; int ret; - indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*adc)); + indio_dev = devm_iio_device_alloc(dev, sizeof(*adc)); if (!indio_dev) return -ENOMEM; adc = iio_priv(indio_dev); adc->spi = spi; - adc->vref = devm_regulator_get_optional(&adc->spi->dev, "vref"); + adc->vref = devm_regulator_get_optional(dev, "vref"); if (IS_ERR(adc->vref)) { if (PTR_ERR(adc->vref) == -ENODEV) { adc->vref = NULL; @@ -487,13 +486,12 @@ static int mcp3911_probe(struct spi_device *spi) if (ret) return ret; - ret = devm_add_action_or_reset(&spi->dev, - mcp3911_cleanup_regulator, adc->vref); + ret = devm_add_action_or_reset(dev, mcp3911_cleanup_regulator, adc->vref); if (ret) return ret; } - adc->clki = devm_clk_get_enabled(&adc->spi->dev, NULL); + adc->clki = devm_clk_get_enabled(dev, NULL); if (IS_ERR(adc->clki)) { if (PTR_ERR(adc->clki) == -ENOENT) { adc->clki = NULL; @@ -506,7 +504,7 @@ static int mcp3911_probe(struct spi_device *spi) if (ret) return ret; - if (device_property_read_bool(&adc->spi->dev, "microchip,data-ready-hiz")) + if (device_property_read_bool(dev, "microchip,data-ready-hiz")) ret = mcp3911_update(adc, MCP3911_REG_STATUSCOM, MCP3911_STATUSCOM_DRHIZ, 0, 2); else @@ -540,15 +538,14 @@ static int mcp3911_probe(struct spi_device *spi) mutex_init(&adc->lock); if (spi->irq > 0) { - adc->trig = devm_iio_trigger_alloc(&spi->dev, "%s-dev%d", - indio_dev->name, - iio_device_id(indio_dev)); + adc->trig = devm_iio_trigger_alloc(dev, "%s-dev%d", indio_dev->name, + iio_device_id(indio_dev)); if (!adc->trig) return -ENOMEM; adc->trig->ops = &mcp3911_trigger_ops; iio_trigger_set_drvdata(adc->trig, adc); - ret = devm_iio_trigger_register(&spi->dev, adc->trig); + ret = devm_iio_trigger_register(dev, adc->trig); if (ret) return ret; @@ -557,20 +554,19 @@ static int mcp3911_probe(struct spi_device *spi) * Some platforms might not allow the option to power it down so * don't enable the interrupt to avoid extra load on the system. */ - ret = devm_request_irq(&spi->dev, spi->irq, - &iio_trigger_generic_data_rdy_poll, IRQF_NO_AUTOEN | IRQF_ONESHOT, - indio_dev->name, adc->trig); + ret = devm_request_irq(dev, spi->irq, &iio_trigger_generic_data_rdy_poll, + IRQF_NO_AUTOEN | IRQF_ONESHOT, + indio_dev->name, adc->trig); if (ret) return ret; } - ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev, - NULL, - mcp3911_trigger_handler, NULL); + ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL, + mcp3911_trigger_handler, NULL); if (ret) return ret; - return devm_iio_device_register(&adc->spi->dev, indio_dev); + return devm_iio_device_register(dev, indio_dev); } static const struct of_device_id mcp3911_dt_ids[] = { From patchwork Tue Aug 22 19:22:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 715852 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C04CEEE49B7 for ; Tue, 22 Aug 2023 19:20:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230128AbjHVTU4 (ORCPT ); Tue, 22 Aug 2023 15:20:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230117AbjHVTUy (ORCPT ); Tue, 22 Aug 2023 15:20:54 -0400 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A785E4C; Tue, 22 Aug 2023 12:20:51 -0700 (PDT) Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-4ffa01fc987so5993346e87.1; Tue, 22 Aug 2023 12:20:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692732049; x=1693336849; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WwaxWwJzWaFmbIWlz2iZAZlWvIFV5uIgKAQG/mKIe+c=; b=c791kH+gYc5af+E9OFJrtPrllp6+2zp/9WkY4+weq0IuNpbKRRzTvKO5dHNErOo2iK j9vLWOVsAxVmxLRk1T3uRVZ/T/PTKUzgpYksd6XsfaTbh0kpRMhby8u8e6INMN4I/3MJ QLgzF6zuoJuQiEHmG1dEP0PWI3S0qHGH7epoH3Tlf+P4WH/oB6028Z8MEH6XCvJWbO7M pEYoPlrRHNvJ/VjgekAH0Yrf7wwA55MWKypSkPFsMgN5lsTr4j7y+Axdh6+bj5ypz0Ip XgzCKNKVjQiU79IEVd7sOHbNFj1ooU1jQFs03RWVHcNKCV4npYuII/iK5VzR/yuYr6gS KQGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692732049; x=1693336849; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WwaxWwJzWaFmbIWlz2iZAZlWvIFV5uIgKAQG/mKIe+c=; b=NFCnH1XcZZ3Nk9O8CbLF9mwaZl7pOX6rmDI7vy9owuNyOjneqRMV4ryf5QfwKhqzTc bDozYk/EXyYex9LexMkvyVArYMHmqY7a0JE0RyBt/zRlefqVWQi2a8F7yvDbo5ZhMQjK uzTCMIPq1zqBcRBC0kWdWtTJ+TERIXF/n0MRqXFDGR3rSihUzlKyeBNMJuLP7OFyRY/X O19q6ReS9Gbh4ekm2Pk21vcfFSF056EVQxJgrXMVwKXrTKBrhH2E3Dc6cffoEScZvJJX TFPldOeF+9J+f9cqWe2oaLwVp9eWq+wgXX5xXdyfS/fBW6TWYd1NonRC3gwfyM/FOB/t P0mg== X-Gm-Message-State: AOJu0Yxa5cMpmgrwKgefPFkoB7TIpx7KXGigQca/k/QZ/Nzkuzp64e+P /nYqtY5CeV0A6JQR5bESFHbxv1tE0728HepT X-Google-Smtp-Source: AGHT+IE5g/+Y9o08OM7NM7UYd6DuEwq2aId8VeLUd82KuF1wC6EHfeKJBBvM9Q2vHk12NAdz6hKJ1w== X-Received: by 2002:a05:6512:114d:b0:4fd:f6db:a7d9 with SMTP id m13-20020a056512114d00b004fdf6dba7d9mr4773166lfg.32.1692732049166; Tue, 22 Aug 2023 12:20:49 -0700 (PDT) Received: from localhost.localdomain (83-233-6-197.cust.bredband2.com. [83.233.6.197]) by smtp.gmail.com with ESMTPSA id b12-20020ac2410c000000b004fe89735f1asm450586lfi.34.2023.08.22.12.20.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 12:20:48 -0700 (PDT) From: Marcus Folkesson To: Marcus Folkesson , Kent Gustavsson , Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andy Shevchenko , Cosmin Tanislav , Arnd Bergmann , ChiYuan Huang , Haibo Chen , Ramona Bolboaca , Ibrahim Tilki , ChiaEn Wu , William Breathitt Gray Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 4/6] iio: adc: mcp3911: fix indentation Date: Tue, 22 Aug 2023 21:22:57 +0200 Message-ID: <20230822192259.1125792-5-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822192259.1125792-1-marcus.folkesson@gmail.com> References: <20230822192259.1125792-1-marcus.folkesson@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The whole file does not make use of indentation properly. Do something about it. Reviewed-by: Andy Shevchenko Signed-off-by: Marcus Folkesson --- Notes: v4: - New patch in this series v5: - Cosmetics v6: - Little rewording in commit message v7: - No changes v8: - No changes drivers/iio/adc/mcp3911.c | 41 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c index 31ee8d7f81de..f9db08813645 100644 --- a/drivers/iio/adc/mcp3911.c +++ b/drivers/iio/adc/mcp3911.c @@ -33,7 +33,7 @@ #define MCP3911_GAIN_VAL(ch, val) ((val << 3 * ch) & MCP3911_GAIN_MASK(ch)) #define MCP3911_REG_STATUSCOM 0x0a -#define MCP3911_STATUSCOM_DRHIZ BIT(12) +#define MCP3911_STATUSCOM_DRHIZ BIT(12) #define MCP3911_STATUSCOM_READ GENMASK(7, 6) #define MCP3911_STATUSCOM_CH1_24WIDTH BIT(4) #define MCP3911_STATUSCOM_CH0_24WIDTH BIT(3) @@ -111,8 +111,7 @@ static int mcp3911_write(struct mcp3911 *adc, u8 reg, u32 val, u8 len) return spi_write(adc->spi, &val, len + 1); } -static int mcp3911_update(struct mcp3911 *adc, u8 reg, u32 mask, - u32 val, u8 len) +static int mcp3911_update(struct mcp3911 *adc, u8 reg, u32 mask, u32 val, u8 len) { u32 tmp; int ret; @@ -127,8 +126,8 @@ static int mcp3911_update(struct mcp3911 *adc, u8 reg, u32 mask, } static int mcp3911_write_raw_get_fmt(struct iio_dev *indio_dev, - struct iio_chan_spec const *chan, - long mask) + struct iio_chan_spec const *chan, + long mask) { switch (mask) { case IIO_CHAN_INFO_SCALE: @@ -141,9 +140,9 @@ static int mcp3911_write_raw_get_fmt(struct iio_dev *indio_dev, } static int mcp3911_read_avail(struct iio_dev *indio_dev, - struct iio_chan_spec const *chan, - const int **vals, int *type, int *length, - long info) + struct iio_chan_spec const *chan, + const int **vals, int *type, int *length, + long info) { switch (info) { case IIO_CHAN_INFO_OVERSAMPLING_RATIO: @@ -212,8 +211,8 @@ static int mcp3911_read_raw(struct iio_dev *indio_dev, } static int mcp3911_write_raw(struct iio_dev *indio_dev, - struct iio_chan_spec const *channel, int val, - int val2, long mask) + struct iio_chan_spec const *channel, int val, + int val2, long mask) { struct mcp3911 *adc = iio_priv(indio_dev); int ret = -EINVAL; @@ -223,12 +222,12 @@ static int mcp3911_write_raw(struct iio_dev *indio_dev, case IIO_CHAN_INFO_SCALE: for (int i = 0; i < MCP3911_NUM_SCALES; i++) { if (val == mcp3911_scale_table[i][0] && - val2 == mcp3911_scale_table[i][1]) { + val2 == mcp3911_scale_table[i][1]) { adc->gain[channel->channel] = BIT(i); ret = mcp3911_update(adc, MCP3911_REG_GAIN, - MCP3911_GAIN_MASK(channel->channel), - MCP3911_GAIN_VAL(channel->channel, i), 1); + MCP3911_GAIN_MASK(channel->channel), + MCP3911_GAIN_VAL(channel->channel, i), 1); } } break; @@ -246,8 +245,8 @@ static int mcp3911_write_raw(struct iio_dev *indio_dev, /* Enable offset*/ ret = mcp3911_update(adc, MCP3911_REG_STATUSCOM, - MCP3911_STATUSCOM_EN_OFFCAL, - MCP3911_STATUSCOM_EN_OFFCAL, 2); + MCP3911_STATUSCOM_EN_OFFCAL, + MCP3911_STATUSCOM_EN_OFFCAL, 2); break; case IIO_CHAN_INFO_OVERSAMPLING_RATIO: @@ -255,7 +254,7 @@ static int mcp3911_write_raw(struct iio_dev *indio_dev, if (val == mcp3911_osr_table[i]) { val = FIELD_PREP(MCP3911_CONFIG_OSR, i); ret = mcp3911_update(adc, MCP3911_REG_CONFIG, MCP3911_CONFIG_OSR, - val, 2); + val, 2); break; } } @@ -506,10 +505,10 @@ static int mcp3911_probe(struct spi_device *spi) if (device_property_read_bool(dev, "microchip,data-ready-hiz")) ret = mcp3911_update(adc, MCP3911_REG_STATUSCOM, MCP3911_STATUSCOM_DRHIZ, - 0, 2); + 0, 2); else ret = mcp3911_update(adc, MCP3911_REG_STATUSCOM, MCP3911_STATUSCOM_DRHIZ, - MCP3911_STATUSCOM_DRHIZ, 2); + MCP3911_STATUSCOM_DRHIZ, 2); if (ret) return ret; @@ -517,12 +516,12 @@ static int mcp3911_probe(struct spi_device *spi) if (ret) return ret; - /* Set gain to 1 for all channels */ + /* Set gain to 1 for all channels */ for (int i = 0; i < MCP3911_NUM_CHANNELS; i++) { adc->gain[i] = 1; ret = mcp3911_update(adc, MCP3911_REG_GAIN, - MCP3911_GAIN_MASK(i), - MCP3911_GAIN_VAL(i, 0), 1); + MCP3911_GAIN_MASK(i), + MCP3911_GAIN_VAL(i, 0), 1); if (ret) return ret; }