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 X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6FDBC4363A for ; Mon, 26 Oct 2020 13:49:22 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 6802A21D42 for ; Mon, 26 Oct 2020 13:49:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="m+ZkRBgM"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="BVb3ChlT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6802A21D42 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=in9MBS3DU3BpXTwtspVSghvi4Lj/3MJkNlJpXj/l+/k=; b=m+ZkRBgMQvhYBXvpD/4H7Ibsr Jj4iY5CcQPxSAQJ4+ehfgsvIiuBl9ZaVDGyPiRrMaNMM342uGiUmqNzQMymi7A8hGz4NyStzbk8bB nRcTyy+wtdbrf7AybPhqgeZ2n/nEn0HjNIySlZRMIZVZ5fkROKHCpCD9l3/cVSjtjbM9DaPuWa+OX ONbovvpTzKbV/1sXj/2y7cDm+aSacVb+QAOfR35x+NAy9GuZnxeIqDJnBd5zuPh3WCjObccFzn3Y7 mluUXD265A1poxbeLh+YJrkTWYPPVKMPsvL6NRbCGvgdnZa3MHwnQpt835a+eraWuX2hdZpOBkde1 hNkLUwRQQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX2pt-0004mt-PK; Mon, 26 Oct 2020 13:46:57 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX2fk-0008Eb-Lv for linux-arm-kernel@lists.infradead.org; Mon, 26 Oct 2020 13:36:33 +0000 Received: by mail-wm1-x342.google.com with SMTP id k18so12467312wmj.5 for ; Mon, 26 Oct 2020 06:36:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SXWR59MruOI4ftzXqa49n6gagW95FuEqQ5BRdlBW3D0=; b=BVb3ChlTrKd6RBLbM7FQM9prom3acrYkxX+BkBhdIp5YYz1kU5+7cXLDmQ2i7s+Dif Esu1jX49DCMdRmMs03hAYnBBBLUfCE1fdV4J4uDyTsEoM2PC6Uc+WZQPiN8yIGh1Ni4d A8oOGmUPlXHj8AwVEIu0HPwQDBhimy505MPCBUGYDB4fyeMv3bOCZsVEG20CKkE5hwRQ ym/uK5blzf5j074tXR6+Euos9aafumbqnueCOUHdoVkF9Nrvkz1NYRiyLZp/WatIzrnR Qp677pDVNjFTvL03E47ww4HVQkPB3DytSrBRLcaHtHQ/unzySoY/bIM3c7zm/QJ5xie3 fbzA== 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=SXWR59MruOI4ftzXqa49n6gagW95FuEqQ5BRdlBW3D0=; b=k/4gOCriCzjRo+YgDhrDvUykBzCI9Hq1Gh/09LMrBcSMtTbwOhqFi7cazyUL/GFPH+ vOJPzFgGjKslg/gwvJkx8Sq0qu/mNoNAHf596GoWMWXtqZvgVWeO9Mv4uWpMPv5NGhuT ZB/p4NSUynhlIIZNYu/l9Oh5mYjPc1oEuKQ2rjrB5YkqPQ0djI+T60O5+PoQDvmiF7pz BPIusAYjN+xwlnn1xV1lbigIp1Q086NRw8YovFgBiPqayFVsnBk6rT5L5bkCkTV/VNc5 doxpgQgXPF7SiUVmSk0t0tXioWzfVSDDaNc0jNLbRhGMu7UM/oqXpq7Sf7bk3MPmNBjA y5CQ== X-Gm-Message-State: AOAM531FMRTCDoywO+mSlGTd5m/Da4NRPrhuoCDd0EEHWXdOHss9elWU KrCL8ReRAFa8zvtHphfT0JSYgA== X-Google-Smtp-Source: ABdhPJw6LD69F2GZpzdLF6iY8OEb0BrDX2HHqT/seQxWtD4xu+ljXFDFvPheo8jlC8zEpYAwcDhrSA== X-Received: by 2002:a7b:c401:: with SMTP id k1mr15804816wmi.120.1603719385163; Mon, 26 Oct 2020 06:36:25 -0700 (PDT) Received: from localhost.localdomain (lfbn-nic-1-190-206.w2-15.abo.wanadoo.fr. [2.15.39.206]) by smtp.gmail.com with ESMTPSA id f7sm23688991wrx.64.2020.10.26.06.36.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 06:36:24 -0700 (PDT) From: Bartosz Golaszewski To: Jonathan Cameron , Lars-Peter Clausen , Peter Meerwald-Stadler , Michal Simek Subject: [PATCH 3/5] iio: adc: xilinx: use a devres action to disable and unprepare the clock Date: Mon, 26 Oct 2020 14:36:07 +0100 Message-Id: <20201026133609.24262-4-brgl@bgdev.pl> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201026133609.24262-1-brgl@bgdev.pl> References: <20201026133609.24262-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201026_093629_009520_00678C4B X-CRM114-Status: GOOD ( 15.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-iio@vger.kernel.org, Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Bartosz Golaszewski In order to simplify resource management and error paths in probe(), add a devm action that calls clk_disable_unprepare() at driver detach. Signed-off-by: Bartosz Golaszewski --- drivers/iio/adc/xilinx-xadc-core.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c index b516280ccbd4..e0da6258092c 100644 --- a/drivers/iio/adc/xilinx-xadc-core.c +++ b/drivers/iio/adc/xilinx-xadc-core.c @@ -1185,6 +1185,13 @@ static int xadc_parse_dt(struct iio_dev *indio_dev, struct device_node *np, return 0; } +static void xadc_clk_disable_unprepare(void *data) +{ + struct clk *clk = data; + + clk_disable_unprepare(clk); +} + static int xadc_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -1262,6 +1269,11 @@ static int xadc_probe(struct platform_device *pdev) if (ret) goto err_free_samplerate_trigger; + ret = devm_add_action_or_reset(dev, + xadc_clk_disable_unprepare, xadc->clk); + if (ret) + goto err_free_samplerate_trigger; + /* * Make sure not to exceed the maximum samplerate since otherwise the * resulting interrupt storm will soft-lock the system. @@ -1280,7 +1292,7 @@ static int xadc_probe(struct platform_device *pdev) ret = request_irq(xadc->irq, xadc->ops->interrupt_handler, 0, dev_name(dev), indio_dev); if (ret) - goto err_clk_disable_unprepare; + goto err_free_samplerate_trigger; ret = xadc->ops->setup(pdev, indio_dev, xadc->irq); if (ret) @@ -1344,8 +1356,6 @@ static int xadc_probe(struct platform_device *pdev) err_free_irq: free_irq(xadc->irq, indio_dev); cancel_delayed_work_sync(&xadc->zynq_unmask_work); -err_clk_disable_unprepare: - clk_disable_unprepare(xadc->clk); err_free_samplerate_trigger: if (xadc->ops->flags & XADC_FLAGS_BUFFERED) iio_trigger_free(xadc->samplerate_trigger); @@ -1372,7 +1382,6 @@ static int xadc_remove(struct platform_device *pdev) } free_irq(xadc->irq, indio_dev); cancel_delayed_work_sync(&xadc->zynq_unmask_work); - clk_disable_unprepare(xadc->clk); return 0; } -- 2.29.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel