From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> To: "Rafael J. Wysocki" <rjw@rjwysocki.net>, Pavel Machek <pavel@ucw.cz>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Stephen Boyd <sboyd@kernel.org>, Taniya Das <tdas@codeaurora.org>, Michael Turquette <mturquette@baylibre.com>, Andy Gross <agross@kernel.org>, Bjorn Andersson <bjorn.andersson@linaro.org> Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v2 4/5] clk: qcom: use common code for qcom_cc_probe_by_index Date: Wed, 28 Jul 2021 17:24:44 +0300 [thread overview] Message-ID: <20210728142445.774158-5-dmitry.baryshkov@linaro.org> (raw) In-Reply-To: <20210728142445.774158-1-dmitry.baryshkov@linaro.org> 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(-) 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
next prev parent reply other threads:[~2021-07-28 14:26 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-28 14:24 [PATCH v2 0/5] PM: add two devres helpers and use them in qcom cc Dmitry Baryshkov 2021-07-28 14:24 ` [PATCH v2 1/5] PM: runtime: add devm_pm_runtime_enable helper Dmitry Baryshkov 2021-07-28 20:04 ` Bjorn Andersson 2021-07-28 14:24 ` [PATCH v2 2/5] PM: clk: add devm_pm_clk_create helper Dmitry Baryshkov 2021-07-28 20:05 ` Bjorn Andersson 2021-07-28 14:24 ` [PATCH v2 3/5] clk: qcom: use devm_pm_runtime_enable and devm_pm_clk_create Dmitry Baryshkov 2021-07-28 15:00 ` Bjorn Andersson 2021-07-29 14:28 ` Dmitry Baryshkov 2021-07-28 14:24 ` Dmitry Baryshkov [this message] 2021-07-28 14:24 ` [PATCH v2 5/5] clk: qcom: move pm_clk functionality into common code Dmitry Baryshkov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210728142445.774158-5-dmitry.baryshkov@linaro.org \ --to=dmitry.baryshkov@linaro.org \ --cc=agross@kernel.org \ --cc=bjorn.andersson@linaro.org \ --cc=gregkh@linuxfoundation.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-clk@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=mturquette@baylibre.com \ --cc=pavel@ucw.cz \ --cc=rjw@rjwysocki.net \ --cc=sboyd@kernel.org \ --cc=tdas@codeaurora.org \ --subject='Re: [PATCH v2 4/5] clk: qcom: use common code for qcom_cc_probe_by_index' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).