On 11/30/22 7:10 AM, Dmitry Baryshkov wrote:
Simplify __DEFINE_CLK_RPMH macros to use clk_rpmh directly instead of
passing it through the `_platform' argument.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
It's nice that you separated this step. If you eliminated the
platform part in the name in one patch, maybe this could be
done at the same time--and still be an easy-to understand patch?
Please consider it but either way I think it's OK.
-Alex
---
drivers/clk/qcom/clk-rpmh.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c
index dcac84614b06..2bcf725dd919 100644
--- a/drivers/clk/qcom/clk-rpmh.c
+++ b/drivers/clk/qcom/clk-rpmh.c
@@ -70,15 +70,15 @@ struct clk_rpmh_desc {
static DEFINE_MUTEX(rpmh_clk_lock);
-#define __DEFINE_CLK_RPMH(_platform, _name, _cname, _res_name, \
+#define __DEFINE_CLK_RPMH(_name, _cname, _res_name, \
_res_en_offset, _res_on, _div) \
- static struct clk_rpmh _platform##_##_cname##_ao; \
- static struct clk_rpmh _platform##_##_cname = { \
+ static struct clk_rpmh clk_rpmh_##_cname##_ao; \
+ static struct clk_rpmh clk_rpmh_##_cname = { \
.res_name = _res_name, \
.res_addr = _res_en_offset, \
.res_on_val = _res_on, \
.div = _div, \
- .peer = &_platform##_##_cname##_ao, \
+ .peer = &clk_rpmh_##_cname##_ao, \
.valid_state_mask = (BIT(RPMH_WAKE_ONLY_STATE) | \
BIT(RPMH_ACTIVE_ONLY_STATE) | \
BIT(RPMH_SLEEP_STATE)), \
@@ -92,12 +92,12 @@ static DEFINE_MUTEX(rpmh_clk_lock);
.num_parents = 1, \
}, \
}; \
- static struct clk_rpmh _platform##_##_cname##_ao= { \
+ static struct clk_rpmh clk_rpmh_##_cname##_ao= { \
.res_name = _res_name, \
.res_addr = _res_en_offset, \
.res_on_val = _res_on, \
.div = _div, \
- .peer = &_platform##_##_cname, \
+ .peer = &clk_rpmh_##_cname, \
.valid_state_mask = (BIT(RPMH_WAKE_ONLY_STATE) | \
BIT(RPMH_ACTIVE_ONLY_STATE)), \
.hw.init = &(struct clk_init_data){ \
@@ -112,11 +112,11 @@ static DEFINE_MUTEX(rpmh_clk_lock);
}
#define DEFINE_CLK_RPMH_ARC(_name, _res_name, _res_on, _div) \
- __DEFINE_CLK_RPMH(clk_rpmh, _name, _name##_##div##_div, _res_name, \
+ __DEFINE_CLK_RPMH(_name, _name##_##div##_div, _res_name, \
CLK_RPMH_ARC_EN_OFFSET, _res_on, _div)
#define DEFINE_CLK_RPMH_VRM(_name, _suffix, _res_name, _div) \
- __DEFINE_CLK_RPMH(clk_rpmh, _name, _name##_suffix, _res_name, \
+ __DEFINE_CLK_RPMH(_name, _name##_suffix, _res_name, \
CLK_RPMH_VRM_EN_OFFSET, 1, _div)
#define DEFINE_CLK_RPMH_BCM(_name, _res_name) \
