UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

spi: spi-geni-qcom: Convert to use resource-managed OPP API 

Use resource-managed OPP API to simplify code.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
This commit is contained in:
Yangtao Li 2021-03-14 19:34:01 +03:00 committed by Viresh Kumar
parent 300894a6fe
commit cfb12911ff
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/spi/spi-geni-qcom.c
View File

@ -691,14 +691,15 @@ static int spi_geni_probe(struct platform_device *pdev)
mas->se.wrapper = dev_get_drvdata(dev->parent); mas->se.wrapper = dev_get_drvdata(dev->parent);
mas->se.base = base; mas->se.base = base;
mas->se.clk = clk; mas->se.clk = clk;
mas->se.opp_table = dev_pm_opp_set_clkname(&pdev->dev, "se");
if (IS_ERR(mas->se.opp_table)) ret = devm_pm_opp_set_clkname(&pdev->dev, "se");
return PTR_ERR(mas->se.opp_table); if (ret)
return ret;
/* OPP table is optional */ /* OPP table is optional */
ret = dev_pm_opp_of_add_table(&pdev->dev); ret = devm_pm_opp_of_add_table(&pdev->dev);
if (ret && ret != -ENODEV) { if (ret && ret != -ENODEV) {
dev_err(&pdev->dev, "invalid OPP table in device tree\n"); dev_err(&pdev->dev, "invalid OPP table in device tree\n");
goto put_clkname; return ret;
} }
spi->bus_num = -1; spi->bus_num = -1;
@ -750,9 +751,6 @@ spi_geni_probe_free_irq:
free_irq(mas->irq, spi); free_irq(mas->irq, spi);
spi_geni_probe_runtime_disable: spi_geni_probe_runtime_disable:
pm_runtime_disable(dev); pm_runtime_disable(dev);
dev_pm_opp_of_remove_table(&pdev->dev);
put_clkname:
dev_pm_opp_put_clkname(mas->se.opp_table);
return ret; return ret;
} }
@ -766,8 +764,6 @@ static int spi_geni_remove(struct platform_device *pdev)
free_irq(mas->irq, spi); free_irq(mas->irq, spi);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
dev_pm_opp_of_remove_table(&pdev->dev);
dev_pm_opp_put_clkname(mas->se.opp_table);
return 0; return 0;
} }

2
include/linux/qcom-geni-se.h
View File

@ -47,7 +47,6 @@ struct geni_icc_path {
* @num_clk_levels: Number of valid clock levels in clk_perf_tbl * @num_clk_levels: Number of valid clock levels in clk_perf_tbl
* @clk_perf_tbl: Table of clock frequency input to serial engine clock * @clk_perf_tbl: Table of clock frequency input to serial engine clock
* @icc_paths: Array of ICC paths for SE * @icc_paths: Array of ICC paths for SE
* @opp_table: Pointer to the OPP table
*/ */
struct geni_se { struct geni_se {
void __iomem *base; void __iomem *base;
@ -57,7 +56,6 @@ struct geni_se {
unsigned int num_clk_levels; unsigned int num_clk_levels;
unsigned long *clk_perf_tbl; unsigned long *clk_perf_tbl;
struct geni_icc_path icc_paths[3]; struct geni_icc_path icc_paths[3];
struct opp_table *opp_table;
}; };
/* Common SE registers */ /* Common SE registers */