drm/msm: Use generic bulk clock function
Subsystems (4)
PATCH 1/1 drm/msm: Use generic bulk clock function
Remove the homebrewed bulk clock get function and replace it with devm_clk_bulk_get_all().
Signed-off-by Jordan Crouse <[email protected]>
---
drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- drivers/gpu/drm/msm/msm_drv.c | 40 ----------------------------------- drivers/gpu/drm/msm/msm_drv.h | 1 - drivers/gpu/drm/msm/msm_gpu.c | 2 +- 4 files changed, 2 insertions(+), 43 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +1 -1
@@ -1172,7 +1172,7 @@ static int a6xx_gmu_pwrlevels_probe(struct a6xx_gmu *gmu)static int a6xx_gmu_clocks_probe (struct a6xx_gmu *gmu) { -int ret =msm_clk_bulk_get (gmu->dev, &gmu->clocks); +int ret =devm_clk_bulk_get_all (gmu->dev, &gmu->clocks);if (ret <1 )return ret;
drivers/gpu/drm/msm/msm_drv.c +0 -40
@@ -75,46 +75,6 @@ module_param(modeset, bool, 0600);* Util/helpers: */ -int msm_clk_bulk_get (struct device *dev,struct clk_bulk_data **bulk) -{ -struct property *prop; -const char *name; -struct clk_bulk_data *local; -int i =0 , ret, count; - - count =of_property_count_strings (dev->of_node,"clock-names" ); -if (count <1 ) -return 0 ; - - local =devm_kcalloc (dev,sizeof (struct clk_bulk_data *), - count,GFP_KERNEL ); -if (!local) -return -ENOMEM ; - -of_property_for_each_string (dev->of_node,"clock-names" , prop, name) { - local[i].id =devm_kstrdup (dev, name,GFP_KERNEL ); -if (!local[i].id) { -devm_kfree (dev, local); -return -ENOMEM ; - } - - i++; - } - - ret =devm_clk_bulk_get (dev, count, local); - -if (ret) { -for (i =0 ; i < count; i++) -devm_kfree (dev, (void *) local[i].id); -devm_kfree (dev, local); - -return ret; - } - - *bulk = local; -return count; -} -struct clk *msm_clk_bulk_get_clock (struct clk_bulk_data *bulk,int count,const char *name) {
drivers/gpu/drm/msm/msm_drv.h +0 -1
@@ -399,7 +399,6 @@ static inline void msm_perf_debugfs_cleanup(struct msm_drm_private *priv) {}#endif struct clk *msm_clk_get (struct platform_device *pdev,const char *name); -int msm_clk_bulk_get (struct device *dev,struct clk_bulk_data **bulk);struct clk *msm_clk_bulk_get_clock (struct clk_bulk_data *bulk,int count,const char *name);
drivers/gpu/drm/msm/msm_gpu.c +1 -1
@@ -783,7 +783,7 @@ static irqreturn_t irq_handler(int irq, void *data)static int get_clocks (struct platform_device *pdev,struct msm_gpu *gpu) { -int ret =msm_clk_bulk_get (&pdev->dev, &gpu->grp_clks); +int ret =devm_clk_bulk_get_all (&pdev->dev, &gpu->grp_clks);if (ret <1 ) { gpu->nr_clocks =0 ;
Signature · 6 lines
2.7.4 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Quoting Jordan Crouse (2019-07-25 09:53:55)
Quoted 5 lines
Remove the homebrewed bulk clock get function and replace it with
devm_clk_bulk_get_all().Signed-off-by Jordan Crouse <[email protected]>---
Reviewed-by Stephen Boyd <[email protected]>
Quoted 5 lines · Jordan Crouse
Remove the homebrewed bulk clock get function and replace it with
devm_clk_bulk_get_all().Signed-off-by Jordan Crouse <[email protected]>
nice cleanup
Reviewed-by Rob Clark <[email protected]>
Quoted 98 lines
---
drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- drivers/gpu/drm/msm/msm_drv.c | 40 ----------------------------------- drivers/gpu/drm/msm/msm_drv.h | 1 - drivers/gpu/drm/msm/msm_gpu.c | 2 +- 4 files changed, 2 insertions(+), 43 deletions(-)drivers/gpu/drm/msm/adreno/a6xx_gmu.c +1
-1@@ -1172,7 +1172,7 @@ static int a6xx_gmu_pwrlevels_probe(struct a6xx_gmu *gmu)static int a6xx_gmu_clocks_probe (struct a6xx_gmu *gmu) { -int ret =msm_clk_bulk_get (gmu->dev, &gmu->clocks); +int ret =devm_clk_bulk_get_all (gmu->dev, &gmu->clocks);if (ret <1 )return ret;drivers/gpu/drm/msm/msm_drv.c +0
-40@@ -75,46 +75,6 @@ module_param(modeset, bool, 0600);* Util/helpers: */ -int msm_clk_bulk_get (struct device *dev,struct clk_bulk_data **bulk) -{ -struct property *prop; -const char *name; -struct clk_bulk_data *local; -int i =0 , ret, count; - - count =of_property_count_strings (dev->of_node,"clock-names" ); -if (count <1 ) -return 0 ; - - local =devm_kcalloc (dev,sizeof (struct clk_bulk_data *), - count,GFP_KERNEL ); -if (!local) -return -ENOMEM ; - -of_property_for_each_string (dev->of_node,"clock-names" , prop, name) { - local[i].id =devm_kstrdup (dev, name,GFP_KERNEL ); -if (!local[i].id) { -devm_kfree (dev, local); -return -ENOMEM ; - } - - i++; - } - - ret =devm_clk_bulk_get (dev, count, local); - -if (ret) { -for (i =0 ; i < count; i++) -devm_kfree (dev, (void *) local[i].id); -devm_kfree (dev, local); - -return ret; - } - - *bulk = local; -return count; -} -struct clk *msm_clk_bulk_get_clock (struct clk_bulk_data *bulk,int count,const char *name) {drivers/gpu/drm/msm/msm_drv.h +0
-1@@ -399,7 +399,6 @@ static inline void msm_perf_debugfs_cleanup(struct msm_drm_private *priv) {}#endif struct clk *msm_clk_get (struct platform_device *pdev,const char *name); -int msm_clk_bulk_get (struct device *dev,struct clk_bulk_data **bulk);struct clk *msm_clk_bulk_get_clock (struct clk_bulk_data *bulk,int count,const char *name);drivers/gpu/drm/msm/msm_gpu.c +1
-2@@ -783,7 +783,7 @@ static irqreturn_t irq_handler(int irq, void *data)static int get_clocks (struct platform_device *pdev,struct msm_gpu *gpu) { -int ret =msm_clk_bulk_get (&pdev->dev, &gpu->grp_clks); +int ret =devm_clk_bulk_get_all (&pdev->dev, &gpu->grp_clks);if (ret <1 ) { gpu->nr_clocks =0 ; --
Quoted 2 lines
2.7.4
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno