From patchwork Wed Apr 3 07:03:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10882945 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 6515A1575 for ; Wed, 3 Apr 2019 07:03:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4EA8D28931 for ; Wed, 3 Apr 2019 07:03:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42F6D2896F; Wed, 3 Apr 2019 07:03:49 +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 A3A6728931 for ; Wed, 3 Apr 2019 07:03:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728671AbfDCHDr (ORCPT ); Wed, 3 Apr 2019 03:03:47 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:47101 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726004AbfDCHDq (ORCPT ); Wed, 3 Apr 2019 03:03:46 -0400 Received: by mail-pl1-f193.google.com with SMTP id y6so7549070pll.13; Wed, 03 Apr 2019 00:03:46 -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 :mime-version:content-transfer-encoding; bh=Vb9uAQH/o2De1YmvUYnPDAc0vIUTfBsphA2YuXBH1ZI=; b=VKNV3gMuZvYBIxh+lUcJJSwq1yWv0brZuWe+GN3oK7LPLUtyqY+TG3omPWbOZOas8b K9i8JYMxsD37cjJ9T9i5q5RB4EEByiAfuf6v3DkWZ+Rz3d8Ft3NR4WTKS7fcYcKaGHL8 hLPoVIWE2RKLgy41hclKX0JsoMBqYKO4btyLIVTuEGMUBDPnCKaLDDEPzqtsw7i448WY q40FbsV4QXKW0+yP4pSslnIzUd/VoFeGtc+FvElGzz/hycMv84BQVq186veXBzKy9NTN 2miuovwGcP26SBlA8pEWkqDWMF2rpkYpcG8GWLEvUWC3iHc87VEeZDY9SPS8GGdvQf4e xBTw== 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=Vb9uAQH/o2De1YmvUYnPDAc0vIUTfBsphA2YuXBH1ZI=; b=pwgQkfNlFWHFUdVKFyFTzbwWrFdNwR+rJxtabiiaW9TIJIGJNouO+yDE2zuh1uBYPN GSQjdk5RFJICbwaeJg3wlgpe/zxUeBWXiYpA4I7l7Xe8r8+XM63gn4pqBIbkanpMfGFc cNBWL8ofj5/8QacGuE9si/3baZMigtG382lbtwUBIAVqaAYnejxRudf0FQwvw22lo/n1 JEnO3LqUZfuuD37iV9EzODij9AVxppB6NyHC7jo4Yo++UM76BEvYdr8cQcAn+xaMjGa7 rqqoAUwW7JB+VpY8MmzVp24VhwowLfTIVdbG+aNj1GD16MI0g+8mcvEyDVsBvBL0IOAS QzAw== X-Gm-Message-State: APjAAAUXppWZYoTaFjOibgCkeR4TAv5qLLmoGt1nqfSio0eTFH4YskgG fxHnNScgmqX/ohKww4dWNPnIsMmb X-Google-Smtp-Source: APXvYqyiQOYj0u/lWX/a0Z5WBu9oY2XExn8qPDtP0TLrNOH7LaMo5uQnwREt8HhucYdZROZXPwQvsQ== X-Received: by 2002:a17:902:1008:: with SMTP id b8mr73100619pla.120.1554275025308; Wed, 03 Apr 2019 00:03:45 -0700 (PDT) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id e22sm20602750pfi.126.2019.04.03.00.03.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Apr 2019 00:03:44 -0700 (PDT) From: Andrey Smirnov To: linux-iio@vger.kernel.org Cc: Andrey Smirnov , Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Chris Healy , linux-kernel@vger.kernel.org Subject: [PATCH 1/6] iio: imx7d_adc: Add local struct device pointer in imx7d_adc_probe() Date: Wed, 3 Apr 2019 00:03:20 -0700 Message-Id: <20190403070325.1077-2-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190403070325.1077-1-andrew.smirnov@gmail.com> References: <20190403070325.1077-1-andrew.smirnov@gmail.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 Use a local "struct device *dev" in imx7d_adc_probe() for brevity. No functional change intended. Signed-off-by: Andrey Smirnov Cc: Jonathan Cameron Cc: Hartmut Knaack Cc: Lars-Peter Clausen Cc: Peter Meerwald-Stadler Cc: Chris Healy Cc: linux-iio@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/iio/adc/imx7d_adc.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/drivers/iio/adc/imx7d_adc.c b/drivers/iio/adc/imx7d_adc.c index ad6764fb2a23..3bbd657409d5 100644 --- a/drivers/iio/adc/imx7d_adc.c +++ b/drivers/iio/adc/imx7d_adc.c @@ -438,51 +438,51 @@ static int imx7d_adc_probe(struct platform_device *pdev) struct imx7d_adc *info; struct iio_dev *indio_dev; struct resource *mem; + struct device *dev = &pdev->dev; int irq; int ret; - indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*info)); + indio_dev = devm_iio_device_alloc(dev, sizeof(*info)); if (!indio_dev) { dev_err(&pdev->dev, "Failed allocating iio device\n"); return -ENOMEM; } info = iio_priv(indio_dev); - info->dev = &pdev->dev; + info->dev = dev; mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - info->regs = devm_ioremap_resource(&pdev->dev, mem); + info->regs = devm_ioremap_resource(dev, mem); if (IS_ERR(info->regs)) { ret = PTR_ERR(info->regs); - dev_err(&pdev->dev, - "Failed to remap adc memory, err = %d\n", ret); + dev_err(dev, "Failed to remap adc memory, err = %d\n", ret); return ret; } irq = platform_get_irq(pdev, 0); if (irq < 0) { - dev_err(&pdev->dev, "No irq resource?\n"); + dev_err(dev, "No irq resource?\n"); return irq; } - info->clk = devm_clk_get(&pdev->dev, "adc"); + info->clk = devm_clk_get(dev, "adc"); if (IS_ERR(info->clk)) { ret = PTR_ERR(info->clk); - dev_err(&pdev->dev, "Failed getting clock, err = %d\n", ret); + dev_err(dev, "Failed getting clock, err = %d\n", ret); return ret; } - info->vref = devm_regulator_get(&pdev->dev, "vref"); + info->vref = devm_regulator_get(dev, "vref"); if (IS_ERR(info->vref)) { ret = PTR_ERR(info->vref); - dev_err(&pdev->dev, + dev_err(dev, "Failed getting reference voltage, err = %d\n", ret); return ret; } ret = regulator_enable(info->vref); if (ret) { - dev_err(&pdev->dev, + dev_err(dev, "Can't enable adc reference top voltage, err = %d\n", ret); return ret; @@ -492,8 +492,8 @@ static int imx7d_adc_probe(struct platform_device *pdev) init_completion(&info->completion); - indio_dev->name = dev_name(&pdev->dev); - indio_dev->dev.parent = &pdev->dev; + indio_dev->name = dev_name(dev); + indio_dev->dev.parent = dev; indio_dev->info = &imx7d_adc_iio_info; indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->channels = imx7d_adc_iio_channels; @@ -501,16 +501,15 @@ static int imx7d_adc_probe(struct platform_device *pdev) ret = clk_prepare_enable(info->clk); if (ret) { - dev_err(&pdev->dev, - "Could not prepare or enable the clock.\n"); + dev_err(dev, "Could not prepare or enable the clock.\n"); goto error_adc_clk_enable; } - ret = devm_request_irq(info->dev, irq, - imx7d_adc_isr, 0, - dev_name(&pdev->dev), info); + ret = devm_request_irq(dev, irq, + imx7d_adc_isr, 0, + dev_name(dev), info); if (ret < 0) { - dev_err(&pdev->dev, "Failed requesting irq, irq = %d\n", irq); + dev_err(dev, "Failed requesting irq, irq = %d\n", irq); goto error_iio_device_register; } From patchwork Wed Apr 3 07:03:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10882955 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 C08B6139A for ; Wed, 3 Apr 2019 07:04:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA5B228931 for ; Wed, 3 Apr 2019 07:04:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9EC302894E; Wed, 3 Apr 2019 07:04:16 +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 47F4C2896F for ; Wed, 3 Apr 2019 07:04:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728696AbfDCHDs (ORCPT ); Wed, 3 Apr 2019 03:03:48 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:32773 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728673AbfDCHDs (ORCPT ); Wed, 3 Apr 2019 03:03:48 -0400 Received: by mail-pg1-f193.google.com with SMTP id k19so1161895pgh.0; Wed, 03 Apr 2019 00:03:47 -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 :mime-version:content-transfer-encoding; bh=ieKsljjbAwxH7pp36Hh7KqVH3DSOT/7yn21e/IKxtsE=; b=dDXQ6bpk+vYp8r5atlPowmb6yR6GJt2vk6U3g6ZnMXwcgOuwkojPTGBoQ3QhtLYrNw djNB0E3+2ZLEnB+j3GE1koUCfCP0SmWwQwoSmTXok4z5H6+gAlrhKdWpax7vxb+p7QyM xkBLzpBvET25UA3KmTW/x0Pxlr10GZ+UcmgYuUQHzPDjIj5F7PsORGI69EzzsX9C9L8w 72Z5zBorvo9TaZ2Fovr1b2UE2d8+gI2Yo0oUjtzPpXF/Xy/DitYYeY/ywWGvkQRNPAmv oFO3yaJeOjYdaPn28jZKs7CzonYqd6UZde+nEbrAWkgPfl9eCr7bQi/oFHorZVv4GnsB O3zw== 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=ieKsljjbAwxH7pp36Hh7KqVH3DSOT/7yn21e/IKxtsE=; b=IBntC+rzqfrtj5ZNtJ7yd566EuiiigbZWwUo0fo3SqjJLhbflkdxWh5UvpiaGU7Ovi C38OLhsiGik4G/RLzn9RY9rmIRhnjOn+iG+ZJu1ultIlkNVirxjts1OBQXOWV7Zz0q2u 8mO5m1cZnC4g0fiU5QXw40y9DVegT6V9QECOS5oexabkja41DfF9s3dgq0ZFXqP2mv+O I0OSscVlYNpugHD0xYAnvm7SzUVboY6csSpQlU5ug82YQEiU7OqcEgIk3hL7nxJErYmC /2zbWTjz4OubiZkWeFik79+Eoa+uBb2d5GpJ2nNDia76Eb7NP7OSy2JS4Db3NBcD9bNN uPXg== X-Gm-Message-State: APjAAAUuXApGRVi5/LfKERYzPZQy/mVOvCBdMXm+XEGGjJzmqOdAgbeV 1xMrhdAyftLMpI+UUzfRldwNsZNz X-Google-Smtp-Source: APXvYqwQ5dbWC8206Z15fTqxar5kaagIiLLQeQLYNzCwSS1x+Vtx/KQAAGvn8xtR50A+kBzHVmGYlQ== X-Received: by 2002:a63:c242:: with SMTP id l2mr71202531pgg.138.1554275026954; Wed, 03 Apr 2019 00:03:46 -0700 (PDT) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id e22sm20602750pfi.126.2019.04.03.00.03.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Apr 2019 00:03:46 -0700 (PDT) From: Andrey Smirnov To: linux-iio@vger.kernel.org Cc: Andrey Smirnov , Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Chris Healy , linux-kernel@vger.kernel.org Subject: [PATCH 2/6] iio: imx7d_adc: Replace pr_err with dev_err Date: Wed, 3 Apr 2019 00:03:21 -0700 Message-Id: <20190403070325.1077-3-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190403070325.1077-1-andrew.smirnov@gmail.com> References: <20190403070325.1077-1-andrew.smirnov@gmail.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 Replace combination of pr_err()/dev_name() with an equivalent call for dev_err(). Signed-off-by: Andrey Smirnov Cc: Jonathan Cameron Cc: Hartmut Knaack Cc: Lars-Peter Clausen Cc: Peter Meerwald-Stadler Cc: Chris Healy Cc: linux-iio@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/iio/adc/imx7d_adc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/iio/adc/imx7d_adc.c b/drivers/iio/adc/imx7d_adc.c index 3bbd657409d5..72cfe9834bcb 100644 --- a/drivers/iio/adc/imx7d_adc.c +++ b/drivers/iio/adc/imx7d_adc.c @@ -388,8 +388,9 @@ static irqreturn_t imx7d_adc_isr(int irq, void *dev_id) * timeout flags. */ if (status & IMX7D_REG_ADC_INT_STATUS_CHANNEL_CONV_TIME_OUT) { - pr_err("%s: ADC got conversion time out interrupt: 0x%08x\n", - dev_name(info->dev), status); + dev_err(info->dev, + "ADC got conversion time out interrupt: 0x%08x\n", + status); status &= ~IMX7D_REG_ADC_INT_STATUS_CHANNEL_CONV_TIME_OUT; writel(status, info->regs + IMX7D_REG_ADC_INT_STATUS); } From patchwork Wed Apr 3 07:03:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10882953 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 7C2B51575 for ; Wed, 3 Apr 2019 07:04:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 629EC28931 for ; Wed, 3 Apr 2019 07:04:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 52E132899E; Wed, 3 Apr 2019 07:04:16 +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 EDAD928931 for ; Wed, 3 Apr 2019 07:04:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728786AbfDCHEK (ORCPT ); Wed, 3 Apr 2019 03:04:10 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:43548 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728701AbfDCHDt (ORCPT ); Wed, 3 Apr 2019 03:03:49 -0400 Received: by mail-pg1-f194.google.com with SMTP id z9so7823106pgu.10; Wed, 03 Apr 2019 00:03:48 -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 :mime-version:content-transfer-encoding; bh=m0Yltnmqgxph/eGeJ34Ce62Zgj1P8Kis8u3YVkRijyY=; b=hC5Y7EMy9VWhxlyShK6uB4W3PKqXn7DkXMGj8qzITxSM1agmgfKfmf2qIeAbtP9aCl S6EE11zm0OgZWURMX3uUqrOuEYFtGgZz+lwZ3ECoFdFZ1r9ibY6GbKzWqFyek6fth2Q1 UtoaWlDH2VkG5Clxd8t6jZlpV0zo/q63vSXF2T5ve5XwnfJyZdBow4Xxdey41iF7quuN CRRka00/cgaSawJX6IERwpqasZlsjsKmuU5VwvUMNuz7MBrQeL9F071lgTVTfte8SRO0 OHaHCq8o9V30EiMIYSiYyq3CAYLDPigSnsaTjPO23Ejsp+zXs2pfVNBPRMIQM3JfO0fl eZ0g== 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=m0Yltnmqgxph/eGeJ34Ce62Zgj1P8Kis8u3YVkRijyY=; b=LxR7TOsVoYqIfVfUMLNAacWHz+xE2OF0tZcCtadwzoAcU/nS5skrys2E9fhyBr1a4J h6ES8kxUQ5iylqVKcX22/yHbbrHZ+ONU7EpqQ6W+LS2FVtTSWF0bTqcX8LDTnbDm/2WY 95/feGKKSwbfrfjxjWnE7JZBglmg+tywojwyg5ihW9DMXPY+SdMV8jxyyn4bb3CTOeWx oRrqfCjBFD32RSl4HoscOYpuVzF5cT+hLDGXtImm0xSmuoTpzARP/Ki6AcB+q+VkqAjj kpwkZjixeznp/ml9SqQaNkSISwGXzKJrQt3ZdiA4dHb6OkyI1b6Y/Y4og0FpE3JniGPN 0C1g== X-Gm-Message-State: APjAAAVRzHlMZk+19SbVlMTNzhhM9y1/efik24v1UbJEoCsw1Eflg7od PcTkaj1iv4qv5nyf/IC+g1sEEmH9 X-Google-Smtp-Source: APXvYqwEBURyZYDon/koDwEhab+CF3h84IKy97fUy24tqt9WnON6QUwyjZub8tMz/McbSJ2I1QGWXA== X-Received: by 2002:a62:58c7:: with SMTP id m190mr73357796pfb.4.1554275028199; Wed, 03 Apr 2019 00:03:48 -0700 (PDT) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id e22sm20602750pfi.126.2019.04.03.00.03.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Apr 2019 00:03:47 -0700 (PDT) From: Andrey Smirnov To: linux-iio@vger.kernel.org Cc: Andrey Smirnov , Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Chris Healy , linux-kernel@vger.kernel.org Subject: [PATCH 3/6] iio: imx7d_adc: Use devm_iio_device_register() Date: Wed, 3 Apr 2019 00:03:22 -0700 Message-Id: <20190403070325.1077-4-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190403070325.1077-1-andrew.smirnov@gmail.com> References: <20190403070325.1077-1-andrew.smirnov@gmail.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 Use devm_iio_device_register() and drop explicit call to iio_device_unregister(). Signed-off-by: Andrey Smirnov Cc: Jonathan Cameron Cc: Hartmut Knaack Cc: Lars-Peter Clausen Cc: Peter Meerwald-Stadler Cc: Chris Healy Cc: linux-iio@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/iio/adc/imx7d_adc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/iio/adc/imx7d_adc.c b/drivers/iio/adc/imx7d_adc.c index 72cfe9834bcb..9a46838ec7cf 100644 --- a/drivers/iio/adc/imx7d_adc.c +++ b/drivers/iio/adc/imx7d_adc.c @@ -517,7 +517,7 @@ static int imx7d_adc_probe(struct platform_device *pdev) imx7d_adc_feature_config(info); imx7d_adc_hw_init(info); - ret = iio_device_register(indio_dev); + ret = devm_iio_device_register(dev, indio_dev); if (ret) { imx7d_adc_power_down(info); dev_err(&pdev->dev, "Couldn't register the device.\n"); @@ -539,8 +539,6 @@ static int imx7d_adc_remove(struct platform_device *pdev) struct iio_dev *indio_dev = platform_get_drvdata(pdev); struct imx7d_adc *info = iio_priv(indio_dev); - iio_device_unregister(indio_dev); - imx7d_adc_power_down(info); clk_disable_unprepare(info->clk); From patchwork Wed Apr 3 07:03:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10882951 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 98EB8139A for ; Wed, 3 Apr 2019 07:04:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 83E1728931 for ; Wed, 3 Apr 2019 07:04:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 77C402896F; Wed, 3 Apr 2019 07:04:09 +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 DEBAB2894E for ; Wed, 3 Apr 2019 07:04:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728774AbfDCHDv (ORCPT ); Wed, 3 Apr 2019 03:03:51 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:45222 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728771AbfDCHDv (ORCPT ); Wed, 3 Apr 2019 03:03:51 -0400 Received: by mail-pg1-f193.google.com with SMTP id y3so7817725pgk.12; Wed, 03 Apr 2019 00:03:50 -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 :mime-version:content-transfer-encoding; bh=lsmfB0G+hQf4SGB6WnLz/inN0CmeW1ILJP4wTpRSWHA=; b=CWZbvmDe4f5Q7tQeO8FGrKLK6K77hcEaWSKAvOjjMJRoFCyxNzeW7IL+vKMXRV+fWj Z4rr8dsKUhJ46p2QJQzEIlTxSuytxBOUqOazI0rCz7SJXe9TUuQ1I4WALGvYjqlhO30E 6AbuV1jP6EGTKrsipSgDKkBmDl+pp/XAo11oC8MpEubF+GQyh3JnqK221mHf/aPp5JCw o6EyWN46quz+AFDSSJ3LSJk2IL57p1HQ+rEne1Thkfd0NcHhZ23IbRQn4QBDwxai8ow0 oRuEpfGd9Z0NIvz4mfqCZAaljfO4ecL7svA+wORflD+KUEabiM5dOqRpDP0TKcMgSK4P MxFg== 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=lsmfB0G+hQf4SGB6WnLz/inN0CmeW1ILJP4wTpRSWHA=; b=sJ8PQHwO8BMjmfnSLhotyO43J5AXPU5ND18Mmn4cbRHJ+inrdIz52XWus0U9OFBRc2 UDfhjQpCKE0o+WDs1dpNIjUqoIWUqM1JC6vTGkxNRNvHo0JAtS9PCcaCxEMwM7Ubpa6X I8lmw3ybyYYKzIBrBuavFTe/F5Y3ZRn7cXlcxzks0dzkJcTCfBeKK0j8XFwU/7R2KDEj cgGoOSnbI1UydHn3q7Qp5hzgbs/2jAkothMT0R0uU8DzfUeQpbp9qC1+Dv0eOg8gXDG3 ohp4GWuYdm7MgXr1zngJLShWFQOl8j16Y2HZWI/XfLgRHzo48mU1xPm5vHeUgES6guRx d7jg== X-Gm-Message-State: APjAAAUWkglQNzpCZ0hxAunuHukPtspQ9X/M+7u+kXOGNlNh2n1bZ9B8 GEafL+1SaKumtZyNV7d3wyTbjhwc X-Google-Smtp-Source: APXvYqyiVVFOOPm5x/zLFIF4bBzOAvq0KB/UEKDgONWbFMxphyoT7OObXmLpCzup/UXl7z3OG/XUfg== X-Received: by 2002:a63:525f:: with SMTP id s31mr70502941pgl.172.1554275029566; Wed, 03 Apr 2019 00:03:49 -0700 (PDT) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id e22sm20602750pfi.126.2019.04.03.00.03.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Apr 2019 00:03:48 -0700 (PDT) From: Andrey Smirnov To: linux-iio@vger.kernel.org Cc: Andrey Smirnov , Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Chris Healy , linux-kernel@vger.kernel.org Subject: [PATCH 4/6] iio: imx7d_adc: Use devm_platform_ioremap_resource() Date: Wed, 3 Apr 2019 00:03:23 -0700 Message-Id: <20190403070325.1077-5-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190403070325.1077-1-andrew.smirnov@gmail.com> References: <20190403070325.1077-1-andrew.smirnov@gmail.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 Use devm_platform_ioremap_resource() to be able to drop a bit of explicit boilerplate code. Signed-off-by: Andrey Smirnov Cc: Jonathan Cameron Cc: Hartmut Knaack Cc: Lars-Peter Clausen Cc: Peter Meerwald-Stadler Cc: Chris Healy Cc: linux-iio@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/iio/adc/imx7d_adc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/iio/adc/imx7d_adc.c b/drivers/iio/adc/imx7d_adc.c index 9a46838ec7cf..8bba92611d54 100644 --- a/drivers/iio/adc/imx7d_adc.c +++ b/drivers/iio/adc/imx7d_adc.c @@ -438,7 +438,6 @@ static int imx7d_adc_probe(struct platform_device *pdev) { struct imx7d_adc *info; struct iio_dev *indio_dev; - struct resource *mem; struct device *dev = &pdev->dev; int irq; int ret; @@ -452,8 +451,7 @@ static int imx7d_adc_probe(struct platform_device *pdev) info = iio_priv(indio_dev); info->dev = dev; - mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - info->regs = devm_ioremap_resource(dev, mem); + info->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(info->regs)) { ret = PTR_ERR(info->regs); dev_err(dev, "Failed to remap adc memory, err = %d\n", ret); From patchwork Wed Apr 3 07:03:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10882949 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 66AC7139A for ; Wed, 3 Apr 2019 07:04:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4EB2E28931 for ; Wed, 3 Apr 2019 07:04:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4156E289A2; Wed, 3 Apr 2019 07:04:08 +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 B3E0F28931 for ; Wed, 3 Apr 2019 07:04:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728799AbfDCHEC (ORCPT ); Wed, 3 Apr 2019 03:04:02 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:32782 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728786AbfDCHDw (ORCPT ); Wed, 3 Apr 2019 03:03:52 -0400 Received: by mail-pg1-f196.google.com with SMTP id k19so1161987pgh.0; Wed, 03 Apr 2019 00:03:51 -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 :mime-version:content-transfer-encoding; bh=VaF+9tRF16mxcQZUyyOPTNZbOsP9r8zQA2RySW0saCU=; b=i7+lgXcnlYQOA2Z9S0ib6RhbwzHnb9R+Lqa7Kh8hKzwVYk6VIkapGtDJA1u5kPIsrv 8+L0heSuTk5K+7CC9oS46SM4GKpXgKJ/3LoGReTpxpHeIiguWTIlPe5zMB0f/oTUfClo 3zcOZRFw5D/9JzVXM1Qq6Mu0fLlPXECncS3Gh90NCpa01fLK/K9CulkRm5JSikhNNBDE mtsxyLU97f9IPYl0mKVXaF757qpHauo4qOBlusyrfbv5ohR7xu6ibMQx9qm+nC59oRC3 bgH8bsHhP9M/7TE6AOklTBFz6V67MMihOgncMW65uwwy+OkA9bYWZqbhYm06kySUMVe5 WVCA== 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=VaF+9tRF16mxcQZUyyOPTNZbOsP9r8zQA2RySW0saCU=; b=JEILcf69wemAhp4bT9jAGG+lhWLy/l6N3+1hM4IEuHSlEI0FVnzPIG8GCKEh0IjF4C 9dukhYfaQ3YzIhyz2O+gpmhz5C1LklUjHhZWutH0SsR0qfOp7oH+MG/1SE/8RV/NzIL/ MMQpQEo5QEmpXxkFV/HdfVLolkKRih+ub2NqLa5Y581+Y7OSl8DeJjc7zoT1kJnTqjIP 140ZPQRmvQjdtJQtsVt/u6PVteGPYZq4WWtTaDaWnhZ9GDKBJueKhvusMaZdRp3jngjq LZjBc7odrasqzewiWhlg9+HQUQ99MrfLrnVwujNQeTnBpXWPCNwrttQMf5TBXQqYmXSf oqrg== X-Gm-Message-State: APjAAAXBKonD2pOwJbu4iidJlJ/wpHrwti84H5aDUhLouQPoeUWtFZM+ hFXaFom9EoYUuznlGj3XJw1D2wVS X-Google-Smtp-Source: APXvYqycINRhUa22A4txqlZLUAIzzvxyDmb1V+OfPMU0ACCXJPcfOKbl9g11tOlq88snOMneBSvTjg== X-Received: by 2002:aa7:9151:: with SMTP id 17mr37393380pfi.192.1554275031187; Wed, 03 Apr 2019 00:03:51 -0700 (PDT) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id e22sm20602750pfi.126.2019.04.03.00.03.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Apr 2019 00:03:50 -0700 (PDT) From: Andrey Smirnov To: linux-iio@vger.kernel.org Cc: Andrey Smirnov , Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Chris Healy , linux-kernel@vger.kernel.org Subject: [PATCH 5/6] iio: imx7d_adc: Use imx7d_adc_resume() in imx7d_adc_probe() Date: Wed, 3 Apr 2019 00:03:24 -0700 Message-Id: <20190403070325.1077-6-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190403070325.1077-1-andrew.smirnov@gmail.com> References: <20190403070325.1077-1-andrew.smirnov@gmail.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 Initialization sequence performed in imx7d_adc_resume() is exactley the same as what's being done in imx7d_adc_probe(). Make use of the former in the latter to avoid code duplication. Signed-off-by: Andrey Smirnov Cc: Jonathan Cameron Cc: Hartmut Knaack Cc: Lars-Peter Clausen Cc: Peter Meerwald-Stadler Cc: Chris Healy Cc: linux-iio@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/iio/adc/imx7d_adc.c | 86 +++++++++++++++---------------------- 1 file changed, 35 insertions(+), 51 deletions(-) diff --git a/drivers/iio/adc/imx7d_adc.c b/drivers/iio/adc/imx7d_adc.c index 8bba92611d54..c2fa0ab923ee 100644 --- a/drivers/iio/adc/imx7d_adc.c +++ b/drivers/iio/adc/imx7d_adc.c @@ -434,6 +434,33 @@ static void imx7d_adc_power_down(struct imx7d_adc *info) writel(adc_cfg, info->regs + IMX7D_REG_ADC_ADC_CFG); } +static int imx7d_adc_resume(struct device *dev) +{ + struct iio_dev *indio_dev = dev_get_drvdata(dev); + struct imx7d_adc *info = iio_priv(indio_dev); + int ret; + + ret = regulator_enable(info->vref); + if (ret) { + dev_err(info->dev, + "Can't enable adc reference top voltage, err = %d\n", + ret); + return ret; + } + + ret = clk_prepare_enable(info->clk); + if (ret) { + dev_err(info->dev, + "Could not prepare or enable clock.\n"); + regulator_disable(info->vref); + return ret; + } + + imx7d_adc_hw_init(info); + + return 0; +} + static int imx7d_adc_probe(struct platform_device *pdev) { struct imx7d_adc *info; @@ -479,14 +506,6 @@ static int imx7d_adc_probe(struct platform_device *pdev) return ret; } - ret = regulator_enable(info->vref); - if (ret) { - dev_err(dev, - "Can't enable adc reference top voltage, err = %d\n", - ret); - return ret; - } - platform_set_drvdata(pdev, indio_dev); init_completion(&info->completion); @@ -498,38 +517,30 @@ static int imx7d_adc_probe(struct platform_device *pdev) indio_dev->channels = imx7d_adc_iio_channels; indio_dev->num_channels = ARRAY_SIZE(imx7d_adc_iio_channels); - ret = clk_prepare_enable(info->clk); - if (ret) { - dev_err(dev, "Could not prepare or enable the clock.\n"); - goto error_adc_clk_enable; - } - ret = devm_request_irq(dev, irq, imx7d_adc_isr, 0, dev_name(dev), info); if (ret < 0) { dev_err(dev, "Failed requesting irq, irq = %d\n", irq); - goto error_iio_device_register; + return ret; } imx7d_adc_feature_config(info); - imx7d_adc_hw_init(info); + + ret = imx7d_adc_resume(&indio_dev->dev); + if (ret) + return ret; ret = devm_iio_device_register(dev, indio_dev); if (ret) { imx7d_adc_power_down(info); + clk_disable_unprepare(info->clk); + regulator_disable(info->vref); dev_err(&pdev->dev, "Couldn't register the device.\n"); - goto error_iio_device_register; + return ret; } return 0; - -error_iio_device_register: - clk_disable_unprepare(info->clk); -error_adc_clk_enable: - regulator_disable(info->vref); - - return ret; } static int imx7d_adc_remove(struct platform_device *pdev) @@ -558,33 +569,6 @@ static int __maybe_unused imx7d_adc_suspend(struct device *dev) return 0; } -static int __maybe_unused imx7d_adc_resume(struct device *dev) -{ - struct iio_dev *indio_dev = dev_get_drvdata(dev); - struct imx7d_adc *info = iio_priv(indio_dev); - int ret; - - ret = regulator_enable(info->vref); - if (ret) { - dev_err(info->dev, - "Can't enable adc reference top voltage, err = %d\n", - ret); - return ret; - } - - ret = clk_prepare_enable(info->clk); - if (ret) { - dev_err(info->dev, - "Could not prepare or enable clock.\n"); - regulator_disable(info->vref); - return ret; - } - - imx7d_adc_hw_init(info); - - return 0; -} - static SIMPLE_DEV_PM_OPS(imx7d_adc_pm_ops, imx7d_adc_suspend, imx7d_adc_resume); static struct platform_driver imx7d_adc_driver = { From patchwork Wed Apr 3 07:03:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10882947 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 6FC1E1575 for ; Wed, 3 Apr 2019 07:04:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 599DE2894E for ; Wed, 3 Apr 2019 07:04:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4DB152899E; Wed, 3 Apr 2019 07:04:03 +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 02AD82894E for ; Wed, 3 Apr 2019 07:04:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728771AbfDCHD4 (ORCPT ); Wed, 3 Apr 2019 03:03:56 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:36454 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728799AbfDCHDx (ORCPT ); Wed, 3 Apr 2019 03:03:53 -0400 Received: by mail-pf1-f195.google.com with SMTP id z5so6655956pfn.3; Wed, 03 Apr 2019 00:03:53 -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 :mime-version:content-transfer-encoding; bh=UanW9KkmJsWd7vTvVGIWm1rlHt42PgVmc/4x9rVyFLc=; b=eU7hZ8V0yhPwBMRz3qKiMzFvNN/CkUgRlP4Sb0mwBWE3hem/mgx+H/D/KtXJYk+2w4 HlcXOliZgN/uiXf6XQ7aNicx1n+Sf5TWBqA8Dzz+Jud9NTQr2VCXxMhVBi5tUn0sKSG8 xCN9CU69C0HLRNyYtDBwUHzd2SK3C+pAt2PSFXiMrfHkDavkj/szxqBPdbHSWpe2QJpC hYC3KXr8oF3xvuJo9+4rz4TH+vm/gmOIR834Hl09BNL2PgnXzzZEFlorsqKwbMCskfv0 jGulLelwP1IAgHd3fQoa5mfli5qat2IZxjzfOAVDTOsG0XgbbT2K9y11bBV7191quqwr k5GQ== 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=UanW9KkmJsWd7vTvVGIWm1rlHt42PgVmc/4x9rVyFLc=; b=bK0kLhAoxzjMQAnybsCIIm2ryDR+/o5D92icwQyxDA5Jjw5Hz6QYKbDuPByVeuUmcn VGXTz3sPx/3E2BSzu2kyqcmgCMs/imEXoKsbQ8+EChOIG7lMIZ1PBN4/6jZPAfrXsEP0 9R4qBiNCx6bq91rieDkDHF2z/OzkVcKOsxgS0BV9CraLMiWlwjpP/yRkiwkcOeAnF7Qo nrKuvWGkPGaqBqBjfcSOXNvKsUkBRbDzgtqxhYng82syP++pwlHlH66HXy96drlQixx/ P2dl9v/RotU6MkMKt3wiIAaSYG77nhsS5K/03TwajkS4F4z7Q/PG91sVFz2+C35vjli7 pc2w== X-Gm-Message-State: APjAAAXfvozzzcbHl4uwOmTleTQ0VYMs6K15mPdXnwYuWNWnJJZrzcCG 2TUZqCu6IpIANrA6fVYM+Hav4DGw X-Google-Smtp-Source: APXvYqyr/q3jx0nUa6mpAp72yvXcDTBpHXDAcskc5a1UkcJyOmJYEbNxF1B9uS4AkosjtcOBvgQP3A== X-Received: by 2002:a62:8381:: with SMTP id h123mr20481130pfe.226.1554275032493; Wed, 03 Apr 2019 00:03:52 -0700 (PDT) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id e22sm20602750pfi.126.2019.04.03.00.03.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Apr 2019 00:03:51 -0700 (PDT) From: Andrey Smirnov To: linux-iio@vger.kernel.org Cc: Andrey Smirnov , Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Chris Healy , linux-kernel@vger.kernel.org Subject: [PATCH 6/6] iio: imx7d_adc: Drop imx7d_adc_remove() Date: Wed, 3 Apr 2019 00:03:25 -0700 Message-Id: <20190403070325.1077-7-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190403070325.1077-1-andrew.smirnov@gmail.com> References: <20190403070325.1077-1-andrew.smirnov@gmail.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 Since imx7d_adc_remove() does exactly the same thing as imx7d_adc_suspend() we can use the latter together with devm_add_action_or_reset() to get rid of the former. Signed-off-by: Andrey Smirnov Cc: Jonathan Cameron Cc: Hartmut Knaack Cc: Lars-Peter Clausen Cc: Peter Meerwald-Stadler Cc: Chris Healy Cc: linux-iio@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/iio/adc/imx7d_adc.c | 55 ++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 32 deletions(-) diff --git a/drivers/iio/adc/imx7d_adc.c b/drivers/iio/adc/imx7d_adc.c index c2fa0ab923ee..ed95909eada2 100644 --- a/drivers/iio/adc/imx7d_adc.c +++ b/drivers/iio/adc/imx7d_adc.c @@ -461,6 +461,24 @@ static int imx7d_adc_resume(struct device *dev) return 0; } +static int imx7d_adc_suspend(struct device *dev) +{ + struct iio_dev *indio_dev = dev_get_drvdata(dev); + struct imx7d_adc *info = iio_priv(indio_dev); + + imx7d_adc_power_down(info); + + clk_disable_unprepare(info->clk); + regulator_disable(info->vref); + + return 0; +} + +static void __imx7d_adc_suspend(void *data) +{ + imx7d_adc_suspend(data); +} + static int imx7d_adc_probe(struct platform_device *pdev) { struct imx7d_adc *info; @@ -506,8 +524,6 @@ static int imx7d_adc_probe(struct platform_device *pdev) return ret; } - platform_set_drvdata(pdev, indio_dev); - init_completion(&info->completion); indio_dev->name = dev_name(dev); @@ -531,11 +547,13 @@ static int imx7d_adc_probe(struct platform_device *pdev) if (ret) return ret; + ret = devm_add_action_or_reset(dev, __imx7d_adc_suspend, + &indio_dev->dev); + if (ret) + return ret; + ret = devm_iio_device_register(dev, indio_dev); if (ret) { - imx7d_adc_power_down(info); - clk_disable_unprepare(info->clk); - regulator_disable(info->vref); dev_err(&pdev->dev, "Couldn't register the device.\n"); return ret; } @@ -543,37 +561,10 @@ static int imx7d_adc_probe(struct platform_device *pdev) return 0; } -static int imx7d_adc_remove(struct platform_device *pdev) -{ - struct iio_dev *indio_dev = platform_get_drvdata(pdev); - struct imx7d_adc *info = iio_priv(indio_dev); - - imx7d_adc_power_down(info); - - clk_disable_unprepare(info->clk); - regulator_disable(info->vref); - - return 0; -} - -static int __maybe_unused imx7d_adc_suspend(struct device *dev) -{ - struct iio_dev *indio_dev = dev_get_drvdata(dev); - struct imx7d_adc *info = iio_priv(indio_dev); - - imx7d_adc_power_down(info); - - clk_disable_unprepare(info->clk); - regulator_disable(info->vref); - - return 0; -} - static SIMPLE_DEV_PM_OPS(imx7d_adc_pm_ops, imx7d_adc_suspend, imx7d_adc_resume); static struct platform_driver imx7d_adc_driver = { .probe = imx7d_adc_probe, - .remove = imx7d_adc_remove, .driver = { .name = "imx7d_adc", .of_match_table = imx7d_adc_match,