From patchwork Wed Mar 15 11:31:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Zabel X-Patchwork-Id: 9625397 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6572960424 for ; Wed, 15 Mar 2017 11:31:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E79E2860F for ; Wed, 15 Mar 2017 11:31:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 433B228611; Wed, 15 Mar 2017 11:31:52 +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=-6.9 required=2.0 tests=BAYES_00,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 E167B28610 for ; Wed, 15 Mar 2017 11:31:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753752AbdCOLbt (ORCPT ); Wed, 15 Mar 2017 07:31:49 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:40007 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753577AbdCOLbs (ORCPT ); Wed, 15 Mar 2017 07:31:48 -0400 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7] helo=dude.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.84_2) (envelope-from ) id 1co79e-0007Lw-Pi; Wed, 15 Mar 2017 12:31:46 +0100 From: Philipp Zabel To: linux-mmc@vger.kernel.org Cc: Ulf Hansson , Maxime Ripard , Chen-Yu Tsai , linux-kernel@vger.kernel.org, Philipp Zabel Subject: [PATCH v2 08/14] mmc: sunxi: simplify optional reset handling Date: Wed, 15 Mar 2017 12:31:46 +0100 Message-Id: <20170315113146.27303-1-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.11.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-mmc@vger.kernel.org Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As of commit bb475230b8e5 ("reset: make optional functions really optional"), the reset framework API calls use NULL pointers to describe optional, non-present reset controls. This allows to return errors from devm_reset_control_get_optional and to call reset_control_(de)assert unconditionally. Signed-off-by: Philipp Zabel Acked-by: Chen-Yu Tsai --- drivers/mmc/host/sunxi-mmc.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c index 6ffcd2838272c..4dbdcdfaeb86a 100644 --- a/drivers/mmc/host/sunxi-mmc.c +++ b/drivers/mmc/host/sunxi-mmc.c @@ -1177,7 +1177,7 @@ static int sunxi_mmc_resource_request(struct sunxi_mmc_host *host, } host->reset = devm_reset_control_get_optional(&pdev->dev, "ahb"); - if (PTR_ERR(host->reset) == -EPROBE_DEFER) + if (IS_ERR(host->reset)) return PTR_ERR(host->reset); ret = clk_prepare_enable(host->clk_ahb); @@ -1204,12 +1204,10 @@ static int sunxi_mmc_resource_request(struct sunxi_mmc_host *host, goto error_disable_clk_output; } - if (!IS_ERR(host->reset)) { - ret = reset_control_deassert(host->reset); - if (ret) { - dev_err(&pdev->dev, "reset err %d\n", ret); - goto error_disable_clk_sample; - } + ret = reset_control_deassert(host->reset); + if (ret) { + dev_err(&pdev->dev, "reset err %d\n", ret); + goto error_disable_clk_sample; } /* @@ -1225,8 +1223,7 @@ static int sunxi_mmc_resource_request(struct sunxi_mmc_host *host, sunxi_mmc_handle_manual_stop, 0, "sunxi-mmc", host); error_assert_reset: - if (!IS_ERR(host->reset)) - reset_control_assert(host->reset); + reset_control_assert(host->reset); error_disable_clk_sample: clk_disable_unprepare(host->clk_sample); error_disable_clk_output: @@ -1309,8 +1306,7 @@ static int sunxi_mmc_remove(struct platform_device *pdev) disable_irq(host->irq); sunxi_mmc_reset_host(host); - if (!IS_ERR(host->reset)) - reset_control_assert(host->reset); + reset_control_assert(host->reset); clk_disable_unprepare(host->clk_sample); clk_disable_unprepare(host->clk_output);