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:53 +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 17/31] drm/lima: convert to use devm_pm_opp_* API Use devm_pm_opp_* API to simplify code, and remove opp_table from lima_devfreq. Signed-off-by: Yangtao Li <tiny.windzz@...il.com> --- drivers/gpu/drm/lima/lima_devfreq.c | 40 ++++++++--------------------- drivers/gpu/drm/lima/lima_devfreq.h | 2 -- 2 files changed, 10 insertions(+), 32 deletions(-) diff --git a/drivers/gpu/drm/lima/lima_devfreq.c b/drivers/gpu/drm/lima/lima_devfreq.c index 5686ad4aaf7c..d5937cf86504 100644 --- a/drivers/gpu/drm/lima/lima_devfreq.c +++ b/drivers/gpu/drm/lima/lima_devfreq.c @@ -99,13 +99,6 @@ void lima_devfreq_fini(struct lima_device *ldev) devm_devfreq_remove_device(ldev->dev, devfreq->devfreq); devfreq->devfreq = NULL; } - - dev_pm_opp_of_remove_table(ldev->dev); - - dev_pm_opp_put_regulators(devfreq->regulators_opp_table); - dev_pm_opp_put_clkname(devfreq->clkname_opp_table); - devfreq->regulators_opp_table = NULL; - devfreq->clkname_opp_table = NULL; } int lima_devfreq_init(struct lima_device *ldev) @@ -125,15 +118,11 @@ int lima_devfreq_init(struct lima_device *ldev) spin_lock_init(&ldevfreq->lock); - opp_table = dev_pm_opp_set_clkname(dev, "core"); - if (IS_ERR(opp_table)) { - ret = PTR_ERR(opp_table); - goto err_fini; - } - - ldevfreq->clkname_opp_table = opp_table; + opp_table = devm_pm_opp_set_clkname(dev, "core"); + if (IS_ERR(opp_table)) + return PTR_ERR(opp_table); - opp_table = dev_pm_opp_set_regulators(dev, + opp_table = devm_pm_opp_set_regulators(dev, (const char *[]){ "mali" }, 1); if (IS_ERR(opp_table)) { @@ -141,24 +130,20 @@ int lima_devfreq_init(struct lima_device *ldev) /* Continue if the optional regulator is missing */ if (ret != -ENODEV) - goto err_fini; - } else { - ldevfreq->regulators_opp_table = opp_table; + return ret; } - ret = dev_pm_opp_of_add_table(dev); + ret = devm_pm_opp_of_add_table(dev); if (ret) - goto err_fini; + return ret; lima_devfreq_reset(ldevfreq); cur_freq = clk_get_rate(ldev->clk_gpu); opp = devfreq_recommended_opp(dev, &cur_freq, 0); - if (IS_ERR(opp)) { - ret = PTR_ERR(opp); - goto err_fini; - } + if (IS_ERR(opp)) + return PTR_ERR(opp); lima_devfreq_profile.initial_freq = cur_freq; dev_pm_opp_put(opp); @@ -167,8 +152,7 @@ int lima_devfreq_init(struct lima_device *ldev) DEVFREQ_GOV_SIMPLE_ONDEMAND, NULL); if (IS_ERR(devfreq)) { dev_err(dev, "Couldn't initialize GPU devfreq\n"); - ret = PTR_ERR(devfreq); - goto err_fini; + return PTR_ERR(devfreq); } ldevfreq->devfreq = devfreq; @@ -180,10 +164,6 @@ int lima_devfreq_init(struct lima_device *ldev) ldevfreq->cooling = cooling; return 0; - -err_fini: - lima_devfreq_fini(ldev); - return ret; } void lima_devfreq_record_busy(struct lima_devfreq *devfreq) diff --git a/drivers/gpu/drm/lima/lima_devfreq.h b/drivers/gpu/drm/lima/lima_devfreq.h index 2d9b3008ce77..c3bcae76ca07 100644 --- a/drivers/gpu/drm/lima/lima_devfreq.h +++ b/drivers/gpu/drm/lima/lima_devfreq.h @@ -15,8 +15,6 @@ struct lima_device; struct lima_devfreq { struct devfreq *devfreq; - struct opp_table *clkname_opp_table; - struct opp_table *regulators_opp_table; struct thermal_cooling_device *cooling; ktime_t busy_time; -- 2.25.1
Powered by blists - more mailing lists