lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 1 Jan 2021 16:54:48 +0000 From: Yangtao Li <tiny.windzz@...il.com> To: myungjoo.ham@...sung.com, kyungmin.park@...sung.com, cw00.choi@...sung.com, krzk@...nel.org, shawnguo@...nel.org, s.hauer@...gutronix.de, kernel@...gutronix.de, festevam@...il.com, linux-imx@....com, digetx@...il.com, thierry.reding@...il.com, jonathanh@...dia.com, yuq825@...il.com, airlied@...ux.ie, daniel@...ll.ch, robdclark@...il.com, sean@...rly.run, robh@...nel.org, tomeu.vizoso@...labora.com, steven.price@....com, alyssa.rosenzweig@...labora.com, stanimir.varbanov@...aro.org, agross@...nel.org, bjorn.andersson@...aro.org, mchehab@...nel.org, lukasz.luba@....com, adrian.hunter@...el.com, ulf.hansson@...aro.org, vireshk@...nel.org, nm@...com, sboyd@...nel.org, broonie@...nel.org, gregkh@...uxfoundation.org, jirislaby@...nel.org, rjw@...ysocki.net, jcrouse@...eaurora.org, hoegsberg@...gle.com, eric@...olt.net, tzimmermann@...e.de, marijn.suijten@...ainline.org, gustavoars@...nel.org, emil.velikov@...labora.com, jonathan@...ek.ca, akhilpo@...eaurora.org, smasetty@...eaurora.org, airlied@...hat.com, masneyb@...tation.org, kalyan_t@...eaurora.org, tanmay@...eaurora.org, tiny.windzz@...il.com, ddavenport@...omium.org, jsanka@...eaurora.org, rnayak@...eaurora.org, tongtiangen@...wei.com, miaoqinglang@...wei.com, khsieh@...eaurora.org, abhinavk@...eaurora.org, chandanu@...eaurora.org, groeck@...omium.org, varar@...eaurora.org, mka@...omium.org, harigovi@...eaurora.org, rikard.falkeborn@...il.com, natechancellor@...il.com, georgi.djakov@...aro.org, akashast@...eaurora.org, parashar@...eaurora.org, dianders@...omium.org Cc: linux-pm@...r.kernel.org, linux-kernel@...r.kernel.org, linux-samsung-soc@...r.kernel.org, linux-arm-kernel@...ts.infradead.org, linux-tegra@...r.kernel.org, dri-devel@...ts.freedesktop.org, lima@...ts.freedesktop.org, linux-arm-msm@...r.kernel.org, freedreno@...ts.freedesktop.org, linux-media@...r.kernel.org, linux-mmc@...r.kernel.org, linux-spi@...r.kernel.org, linux-serial@...r.kernel.org Subject: [PATCH 12/31] mmc: sdhci-msm: convert to use devm_pm_opp_* API Use devm_pm_opp_* API to simplify code, and remove opp_table from sdhci_msm_host. Signed-off-by: Yangtao Li <tiny.windzz@...il.com> --- drivers/mmc/host/sdhci-msm.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 094ef95f5ecc..490ba5d68f72 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -261,7 +261,6 @@ struct sdhci_msm_host { struct clk_bulk_data bulk_clks[4]; /* core, iface, cal, sleep clocks */ unsigned long clk_rate; struct mmc_host *mmc; - struct opp_table *opp_table; bool use_14lpp_dll_reset; bool tuning_done; bool calibration_done; @@ -2215,6 +2214,7 @@ static int sdhci_msm_probe(struct platform_device *pdev) const struct sdhci_msm_offset *msm_offset; const struct sdhci_msm_variant_info *var_info; struct device_node *node = pdev->dev.of_node; + struct opp_table *opp_table; host = sdhci_pltfm_init(pdev, &sdhci_msm_pdata, sizeof(*msm_host)); if (IS_ERR(host)) @@ -2283,16 +2283,16 @@ static int sdhci_msm_probe(struct platform_device *pdev) if (ret) goto bus_clk_disable; - msm_host->opp_table = dev_pm_opp_set_clkname(&pdev->dev, "core"); - if (IS_ERR(msm_host->opp_table)) { - ret = PTR_ERR(msm_host->opp_table); + opp_table = devm_pm_opp_set_clkname(&pdev->dev, "core"); + if (IS_ERR(opp_table)) { + ret = PTR_ERR(opp_table); goto bus_clk_disable; } /* OPP table is optional */ - ret = dev_pm_opp_of_add_table(&pdev->dev); + ret = devm_pm_opp_of_add_table(&pdev->dev); if (ret) { - dev_pm_opp_put_clkname(msm_host->opp_table); + devm_pm_opp_put_clkname(&pdev->dev, opp_table); if (ret != -ENODEV) { dev_err(&pdev->dev, "Invalid OPP table in Device tree\n"); goto bus_clk_disable; @@ -2317,7 +2317,7 @@ static int sdhci_msm_probe(struct platform_device *pdev) ret = clk_bulk_prepare_enable(ARRAY_SIZE(msm_host->bulk_clks), msm_host->bulk_clks); if (ret) - goto opp_cleanup; + goto bus_clk_disable; /* * xo clock is needed for FLL feature of cm_dll. @@ -2462,9 +2462,6 @@ static int sdhci_msm_probe(struct platform_device *pdev) clk_disable: clk_bulk_disable_unprepare(ARRAY_SIZE(msm_host->bulk_clks), msm_host->bulk_clks); -opp_cleanup: - dev_pm_opp_of_remove_table(&pdev->dev); - dev_pm_opp_put_clkname(msm_host->opp_table); bus_clk_disable: if (!IS_ERR(msm_host->bus_clk)) clk_disable_unprepare(msm_host->bus_clk); @@ -2483,8 +2480,6 @@ static int sdhci_msm_remove(struct platform_device *pdev) sdhci_remove_host(host, dead); - 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); pm_runtime_put_noidle(&pdev->dev); -- 2.25.1
Powered by blists - more mailing lists