From patchwork Fri Aug 28 06:07:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 248461 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp799346ilg; Thu, 27 Aug 2020 23:09:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzGl9yBSMCG7hrk8AJUchp+fIuwxlpFGzKrRV+Wkp5C9QWOZYL8RXL9narINva0zyPAhkd9 X-Received: by 2002:a17:906:57d9:: with SMTP id u25mr152674ejr.543.1598594940867; Thu, 27 Aug 2020 23:09:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598594940; cv=none; d=google.com; s=arc-20160816; b=HUwKzCq0t6metXrCYGyNn3h8gJTsdzB/78IPj0Fr93IFOA8iCA7wLCTgTfzHifcmvX Ux6rV665eaXt4ctEd0OPiSuPu/DMOE0Tjcs6LulMSdJTcCgnTiAqYuWK2EUyIDCPz/te GRgsJ3G0/IM401pi2ISbVBx74xFu1FxEHF8m3OyA2uGf4nMWsfmki/t7hSj93rFGtk5Y OyZY0sDTyw5E4PPvl3Xk1KQOghAbk3vDdVdoVI3Bhra3o0rUjm04zhE56NxJAsjt2cyH lBLdAe1Y605kiWvK0GiRlXx6uG83lq1cgAvm+DdekjviFeVas7Vwk3PvzK6Yw564soMT j5Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=1O4RY3xhuvkoEFzZpCQj6200V2Vqk24TL8ijKSG6Muc=; b=0idb/EspVhQ3mZukSWxl5e80M0avTcIuCksB4s6C45e6tzOaxBqDgp90je6RxfZYnK ul0KyT5d8l9hoXegYYSO+PCKF70yVxvSIlTNB2JjDvU9K9YDTA/UUdiF8Ou6O9km/IjL EnC+aoRTITTRdhE86Je6JkvbUDMkb4SKoyIZtL4UIiKOa9Cn1U2jR98X19yP2odutvLe H8cZy6qaB1AYkW8Brx+NUr8ShvgeScJ+WnTKrR198q3cJ0H4L48I6UfDKzbzdM7XGsLU lJ8XyLSZOY5PfDQXJM6eq+RbgR5/bYqI0Om8YERvHjcjZSQB12U9f1lAvL71tHYXwejY S1/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YHxrgc08; spf=pass (google.com: domain of linux-mmc-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z9si2905473edq.425.2020.08.27.23.09.00; Thu, 27 Aug 2020 23:09:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-mmc-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YHxrgc08; spf=pass (google.com: domain of linux-mmc-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728063AbgH1GI5 (ORCPT + 5 others); Fri, 28 Aug 2020 02:08:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728062AbgH1GI1 (ORCPT ); Fri, 28 Aug 2020 02:08:27 -0400 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4422C061233 for ; Thu, 27 Aug 2020 23:08:27 -0700 (PDT) Received: by mail-pl1-x643.google.com with SMTP id bh1so1425553plb.12 for ; Thu, 27 Aug 2020 23:08:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1O4RY3xhuvkoEFzZpCQj6200V2Vqk24TL8ijKSG6Muc=; b=YHxrgc08UC1m38a1Dl9/EMqZvlm1VnCvNkcD5izm8rqm0YvG045fdqTeSSWU3zP84e BcHHK7aom3QnCZXtUYQLKNwtzO8Ep+4tdG162+rjOVRMJzAe9ar/ApD7pQMI2nyLOMUH VHxAUkL2Zi7UuCJwfo7ZzxrnFHu1NDpn9oVgClh9Tx+29Pdty6EV9otz6UhKGUR891SW wkvRExXAFgi7fFHZQNrEqAV0/zj9YKpaYfC9Dhuk56XSCOmiDcaepwAo98fzbxuDipUH 6vj1UnT8LoXRzXROKT2eUIwLnX1yD4R4GhACqleeeiYO5gST/E+Tw2Aaja92+f/5DDMD pKZA== 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=1O4RY3xhuvkoEFzZpCQj6200V2Vqk24TL8ijKSG6Muc=; b=NWEKXG+xgZUVAoVSU5ua9rVaSweVPDD9xg93peb9DFgtUcXet3Qj0bSMm5IYdewOcE M7BAoyVjwhVXF3LoYxnk2eslvpG999Reu2ejnw5y15S1XOWvcw7sQ1Mq5VFv1HOayZsI LujP47DmYh+rJABfJnX3+v2YJmVEQ2sdJ0c3z/ETIfv+77vW5pS5+VxYoOwrbCfSSe/y aAjccDBKwrvcVYp3IhUh3GO/cFHOvAsN2asUx0Icu/hlCYXGrN8GJhe1Gu2IqVFN2Wr1 VDYkSeolbcC7RjdsLRcTUbeyKONVTOYprrPr0HFtL1FPyPomk0NZl3I/u7e9yBstDRl9 wp0w== X-Gm-Message-State: AOAM531mpXg5vi3CceZDjMhc5Qgi4xMkDnH5Xvt3us1L6rVQDmQPk8aD klc9W7t+q3gu5E4GnS2ahTsE0A== X-Received: by 2002:a17:902:76c3:: with SMTP id j3mr73551plt.227.1598594906914; Thu, 27 Aug 2020 23:08:26 -0700 (PDT) Received: from localhost ([122.167.135.199]) by smtp.gmail.com with ESMTPSA id d76sm169607pfd.63.2020.08.27.23.08.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Aug 2020 23:08:26 -0700 (PDT) From: Viresh Kumar To: rnayak@codeaurora.org, Adrian Hunter , Andy Gross , Bjorn Andersson , Ulf Hansson Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , Rafael Wysocki , Stephen Boyd , Nishanth Menon , Douglas Anderson , Naresh Kamboju , linux-arm-msm@vger.kernel.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V2 4/8] mmc: sdhci-msm: Unconditionally call dev_pm_opp_of_remove_table() Date: Fri, 28 Aug 2020 11:37:49 +0530 Message-Id: <1d7c97524b9e1fbc60271d9c246c5461ca8a106c.1598594714.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.25.0.rc1.19.g042ed3e048af In-Reply-To: References: MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org dev_pm_opp_of_remove_table() doesn't report any errors when it fails to find the OPP table with error -ENODEV (i.e. OPP table not present for the device). And we can call dev_pm_opp_of_remove_table() unconditionally here. Signed-off-by: Viresh Kumar --- V2: - Compare with -ENODEV only for failures. - Create new label to put clkname. --- drivers/mmc/host/sdhci-msm.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) -- 2.25.0.rc1.19.g042ed3e048af Tested-by: Douglas Anderson Reviewed-by: Douglas Anderson diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 5a33389037cd..f7beaec6412e 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -263,7 +263,6 @@ struct sdhci_msm_host { unsigned long clk_rate; struct mmc_host *mmc; struct opp_table *opp_table; - bool has_opp_table; bool use_14lpp_dll_reset; bool tuning_done; bool calibration_done; @@ -2285,11 +2284,9 @@ static int sdhci_msm_probe(struct platform_device *pdev) /* OPP table is optional */ ret = dev_pm_opp_of_add_table(&pdev->dev); - if (!ret) { - msm_host->has_opp_table = true; - } else if (ret != -ENODEV) { + if (ret && ret != -ENODEV) { dev_err(&pdev->dev, "Invalid OPP table in Device tree\n"); - goto opp_cleanup; + goto opp_put_clkname; } /* Vote for maximum clock rate for maximum performance */ @@ -2453,8 +2450,8 @@ static int sdhci_msm_probe(struct platform_device *pdev) clk_bulk_disable_unprepare(ARRAY_SIZE(msm_host->bulk_clks), msm_host->bulk_clks); opp_cleanup: - if (msm_host->has_opp_table) - dev_pm_opp_of_remove_table(&pdev->dev); + dev_pm_opp_of_remove_table(&pdev->dev); +opp_put_clkname: dev_pm_opp_put_clkname(msm_host->opp_table); bus_clk_disable: if (!IS_ERR(msm_host->bus_clk)) @@ -2474,8 +2471,7 @@ static int sdhci_msm_remove(struct platform_device *pdev) sdhci_remove_host(host, dead); - if (msm_host->has_opp_table) - dev_pm_opp_of_remove_table(&pdev->dev); + dev_pm_opp_of_remove_table(&pdev->dev); dev_pm_opp_put_clkname(msm_host->opp_table); pm_runtime_get_sync(&pdev->dev); pm_runtime_disable(&pdev->dev);