| Message ID | 20210710140130.1176657-2-dmitry.baryshkov@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | clk: qcom: move pm_clk handling to common code | expand |
On Sat 10 Jul 09:01 CDT 2021, Dmitry Baryshkov wrote: > Rewrite qcom_cc_map and qcom_cc_probe_by_index to use (new) > qcom_cc_map_by_index, removing code duplication and opening a way to > have more common code in qcom_cc_map*. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn > --- > drivers/clk/qcom/common.c | 21 ++++++++++----------- > 1 file changed, 10 insertions(+), 11 deletions(-) > > diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c > index 60d2a78d1395..ed7c516a597a 100644 > --- a/drivers/clk/qcom/common.c > +++ b/drivers/clk/qcom/common.c > @@ -69,20 +69,26 @@ int qcom_find_src_index(struct clk_hw *hw, const struct parent_map *map, u8 src) > } > EXPORT_SYMBOL_GPL(qcom_find_src_index); > > -struct regmap * > -qcom_cc_map(struct platform_device *pdev, const struct qcom_cc_desc *desc) > +static struct regmap * > +qcom_cc_map_by_index(struct platform_device *pdev, const struct qcom_cc_desc *desc, int index) > { > void __iomem *base; > struct resource *res; > struct device *dev = &pdev->dev; > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + res = platform_get_resource(pdev, IORESOURCE_MEM, index); > base = devm_ioremap_resource(dev, res); > if (IS_ERR(base)) > return ERR_CAST(base); > > return devm_regmap_init_mmio(dev, base, desc->config); > } > + > +struct regmap * > +qcom_cc_map(struct platform_device *pdev, const struct qcom_cc_desc *desc) > +{ > + return qcom_cc_map_by_index(pdev, desc, 0); > +} > EXPORT_SYMBOL_GPL(qcom_cc_map); > > void > @@ -313,15 +319,8 @@ int qcom_cc_probe_by_index(struct platform_device *pdev, int index, > const struct qcom_cc_desc *desc) > { > struct regmap *regmap; > - struct resource *res; > - void __iomem *base; > - > - res = platform_get_resource(pdev, IORESOURCE_MEM, index); > - base = devm_ioremap_resource(&pdev->dev, res); > - if (IS_ERR(base)) > - return -ENOMEM; > > - regmap = devm_regmap_init_mmio(&pdev->dev, base, desc->config); > + regmap = qcom_cc_map_by_index(pdev, desc, index); > if (IS_ERR(regmap)) > return PTR_ERR(regmap); > > -- > 2.30.2 >
diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c index 60d2a78d1395..ed7c516a597a 100644 --- a/drivers/clk/qcom/common.c +++ b/drivers/clk/qcom/common.c @@ -69,20 +69,26 @@ int qcom_find_src_index(struct clk_hw *hw, const struct parent_map *map, u8 src) } EXPORT_SYMBOL_GPL(qcom_find_src_index); -struct regmap * -qcom_cc_map(struct platform_device *pdev, const struct qcom_cc_desc *desc) +static struct regmap * +qcom_cc_map_by_index(struct platform_device *pdev, const struct qcom_cc_desc *desc, int index) { void __iomem *base; struct resource *res; struct device *dev = &pdev->dev; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + res = platform_get_resource(pdev, IORESOURCE_MEM, index); base = devm_ioremap_resource(dev, res); if (IS_ERR(base)) return ERR_CAST(base); return devm_regmap_init_mmio(dev, base, desc->config); } + +struct regmap * +qcom_cc_map(struct platform_device *pdev, const struct qcom_cc_desc *desc) +{ + return qcom_cc_map_by_index(pdev, desc, 0); +} EXPORT_SYMBOL_GPL(qcom_cc_map); void @@ -313,15 +319,8 @@ int qcom_cc_probe_by_index(struct platform_device *pdev, int index, const struct qcom_cc_desc *desc) { struct regmap *regmap; - struct resource *res; - void __iomem *base; - - res = platform_get_resource(pdev, IORESOURCE_MEM, index); - base = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(base)) - return -ENOMEM; - regmap = devm_regmap_init_mmio(&pdev->dev, base, desc->config); + regmap = qcom_cc_map_by_index(pdev, desc, index); if (IS_ERR(regmap)) return PTR_ERR(regmap);
Rewrite qcom_cc_map and qcom_cc_probe_by_index to use (new) qcom_cc_map_by_index, removing code duplication and opening a way to have more common code in qcom_cc_map*. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/clk/qcom/common.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) -- 2.30.2