From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0DB7C433EF for ; Fri, 8 Oct 2021 18:35:30 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AD55C60F02 for ; Fri, 8 Oct 2021 18:35:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org AD55C60F02 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=usp.br Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:Cc:To: From:Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ZyhVjEvVyrBaLAH+RMbIhmQyikwP0r9FS52d3bC2OqI=; b=KA8qby60xkxwEu A+sB81Jvn47M+v3TW8odCIof4bs8CB/bgsrzwPVV8Hd7ryYd1Cg0UBK/2vh+lFP0eN7xbMHdN9wgq YwzriYweNGJZrl1J1Cmu+elEkJcnTw0Jw8pUA7PwMJLXIGnRBY1QlnjjKMosr9Q7YSiA5kop2T6BX 1Dx2cic3BcUTcFYy17t5Oz/ehYJniYHGRk3t5RJV/m6VOZNptm7ztQxH+PCJsWAdoL8abfvX7pt+4 bl29Ik3nWNB5cNzpW3+aUjB4J7bFVlRFEpQYWAK3jtqRMQ/upXeeeAJguuTxUcsZCBYG97DMtY5bE Xt3hnDtrQHOD4ui5aLXA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mYugD-003p3i-NE; Fri, 08 Oct 2021 18:33:13 +0000 Received: from mail-qk1-x731.google.com ([2607:f8b0:4864:20::731]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mYucp-003n9V-O7 for linux-arm-kernel@lists.infradead.org; Fri, 08 Oct 2021 18:29:47 +0000 Received: by mail-qk1-x731.google.com with SMTP id g21so10348038qki.11 for ; Fri, 08 Oct 2021 11:29:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=usp.br; s=usp-google; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :content-transfer-encoding; bh=KaxjXbd9QQSyixl6jirzIzQXQmAG5ig/YyofwUGoqJs=; b=lzNTFLJPpoogk80sZ/3rmnYg4rO0rXz9eujeKVyD5GBfr8zGvrbdQXP/BNoBxeBC7Q EPVe98Sv9fnzBcsSx3y6eZvxDC/hn++qy9z6J6R18I6omjoV2Ip/dzlTObXftarGMvCx 8qtNHdFJxpJysOgDfCOoX7+5oPDFlV3cv6cObUAqP2D9maxgbBk/tXk1XfM2yBjDV4Cy wj6C6VPXvakWTETDNadFJZBo2X8V+OrplQ1tJL9Mk+WUs34tZ1uBqDmd0Eh87rFQoI69 M4jjAoCP0RLsZWJp6ch8839vvifEEzf/uho7n8crdcIzOyRtPAYXMhcedkrxb0sVGAjq W83g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:content-transfer-encoding; bh=KaxjXbd9QQSyixl6jirzIzQXQmAG5ig/YyofwUGoqJs=; b=h9b0txyR25Z49Zt/g/3lDxi87kqhqtRY5KOr0v/j+9Yl33IfHZgaN9C8B3xsCfBVyx m/aIWMQFhhIosj/q8qpvjmdhZqSHXkuGX6tknI6xkwpVNWKZeS/fiwvGlqaVlSoX3/lq 5svBS3akzNqmDKGjozmK6awrmfacP3HOqIPHQpbSf+7llpFsGKBgBJhBmV4Mbs2Pcc+r jcJ1ED5prCq2ldM8lvAdmvfJiHYdQ9yqHTNGLcdqJHEnq5APyrdk8NuHystbo0G0/iST 2RhDxq1RITkLGzQ0Fjm4bymDo2Rljji4xE3tMhhnhLQQ3AJhWOIKSrpJ2k0+1YUnXjAi FtfA== X-Gm-Message-State: AOAM530PpxBzUhjdqwJNKZpMe2w3VH9E0V7gP8+IAa3M4n2eVC+7B2jm BqQGvEIvICZ+29rMRsNgXGiG6g== X-Google-Smtp-Source: ABdhPJxwHAzMsk4VqiWbdqFduWB/UvyzsE2IlMScFKDx9IOlkQ4AaN81iW+sLbOe0BjtCKsl8LxFEw== X-Received: by 2002:a05:620a:29c6:: with SMTP id s6mr3233300qkp.233.1633717781593; Fri, 08 Oct 2021 11:29:41 -0700 (PDT) Received: from Andryuu.br ([2804:431:c7fd:e4dc:3e3e:a653:b135:3239]) by smtp.gmail.com with ESMTPSA id x18sm116594qkx.94.2021.10.08.11.29.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 11:29:41 -0700 (PDT) Date: Fri, 8 Oct 2021 15:29:37 -0300 From: =?iso-8859-1?Q?Andr=E9?= Gustavo Nakagomi Lopez To: jic23@kernel.org, lars@metafoo.de, vz@mleia.com Cc: linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, andregnl@usp.br Subject: [PATCH] iio: adc: lpc18xx_adc: Convert probe to device managed version Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211008_112944_559149_A9C0DF25 X-CRM114-Status: GOOD ( 18.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The remove function and the goto sections are not necessary if devm functions are used. Convert device register to devm version. Add hook functions to release device resources, and use them inside probe with devm_add_action, which will release resources on driver detach. To maintain the order of which device resources were released/reseted, register the hook functions as soon as resources are obtained/initialized. Since devres actions are called on driver detach, the remove function and the error-handling goto sections are no longer necessary. Signed-off-by: Andr=E9 Gustavo Nakagomi Lopez --- I was not able to test the patch due to the fact I do not have the necessar= y hardware. drivers/iio/adc/lpc18xx_adc.c | 60 +++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/drivers/iio/adc/lpc18xx_adc.c b/drivers/iio/adc/lpc18xx_adc.c index 3566990ae87d..7b6ba5e4a003 100644 --- a/drivers/iio/adc/lpc18xx_adc.c +++ b/drivers/iio/adc/lpc18xx_adc.c @@ -115,6 +115,23 @@ static const struct iio_info lpc18xx_adc_info =3D { .read_raw =3D lpc18xx_adc_read_raw, }; = +static void lpc18xx_writel(void *data) +{ + struct lpc18xx_adc *adc =3D data; + + writel(0, adc->base + LPC18XX_ADC_CR); +} + +static void lpc18xx_clk_disable_unprepare(void *clk) +{ + clk_disable_unprepare(clk); +} + +static void lpc18xx_regulator_disable(void *vref) +{ + regulator_disable(vref); +} + static int lpc18xx_adc_probe(struct platform_device *pdev) { struct iio_dev *indio_dev; @@ -163,46 +180,36 @@ static int lpc18xx_adc_probe(struct platform_device *= pdev) return ret; } = + ret =3D devm_add_action_or_reset(&pdev->dev, lpc18xx_regulator_disable, a= dc->vref); + if (ret) + return ret; + ret =3D clk_prepare_enable(adc->clk); if (ret) { dev_err(&pdev->dev, "unable to enable clock\n"); - goto dis_reg; + return ret; } = + ret =3D devm_add_action_or_reset(&pdev->dev, lpc18xx_clk_disable_unprepar= e, + adc->clk); + if (ret) + return ret; + adc->cr_reg =3D (clkdiv << LPC18XX_ADC_CR_CLKDIV_SHIFT) | LPC18XX_ADC_CR_PDN; writel(adc->cr_reg, adc->base + LPC18XX_ADC_CR); = - ret =3D iio_device_register(indio_dev); - if (ret) { - dev_err(&pdev->dev, "unable to register device\n"); - goto dis_clk; - } + ret =3D devm_add_action_or_reset(&pdev->dev, lpc18xx_writel, adc); + if (ret) + return ret; = - return 0; + ret =3D devm_iio_device_register(&pdev->dev, indio_dev); + if (ret) + dev_err(&pdev->dev, "unable to register device\n"); = -dis_clk: - writel(0, adc->base + LPC18XX_ADC_CR); - clk_disable_unprepare(adc->clk); -dis_reg: - regulator_disable(adc->vref); return ret; } = -static int lpc18xx_adc_remove(struct platform_device *pdev) -{ - struct iio_dev *indio_dev =3D platform_get_drvdata(pdev); - struct lpc18xx_adc *adc =3D iio_priv(indio_dev); - - iio_device_unregister(indio_dev); - - writel(0, adc->base + LPC18XX_ADC_CR); - clk_disable_unprepare(adc->clk); - regulator_disable(adc->vref); - - return 0; -} - static const struct of_device_id lpc18xx_adc_match[] =3D { { .compatible =3D "nxp,lpc1850-adc" }, { /* sentinel */ } @@ -211,7 +218,6 @@ MODULE_DEVICE_TABLE(of, lpc18xx_adc_match); = static struct platform_driver lpc18xx_adc_driver =3D { .probe =3D lpc18xx_adc_probe, - .remove =3D lpc18xx_adc_remove, .driver =3D { .name =3D "lpc18xx-adc", .of_match_table =3D lpc18xx_adc_match, -- = 2.33.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel