[PATCH v4 2/7] clk: spacemit: rename spacemit_ccu_data fields

Alex Elder
2025-04-14T19:21:34Z

Add "clk_" to the names of the fields in the spacemit_ccu_data structure
type. This prepares it for the addition of two similar fields dedicated
to resets.

Signed-off-by: Alex Elder <elder@riscstar.com>
---
drivers/clk/spacemit/ccu-k1.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/clk/spacemit/ccu-k1.c b/drivers/clk/spacemit/ccu-k1.c
index a55957806db31..4db91c1b1d280 100644
--- a/drivers/clk/spacemit/ccu-k1.c
+++ b/drivers/clk/spacemit/ccu-k1.c
@@ -130,8 +130,8 @@
#define APMU_EMAC1_CLK_RES_CTRL 0x3ec

struct spacemit_ccu_data {
- struct clk_hw **hws;
- size_t num;
+ struct clk_hw **clk_hws;
+ size_t clk_num;
};

/* APBS clocks start, APBS region contains and only contains all PLL clocks */
@@ -819,8 +819,8 @@ static struct clk_hw *k1_ccu_pll_hws[] = {
};

static const struct spacemit_ccu_data k1_ccu_pll_data = {
- .hws = k1_ccu_pll_hws,
- .num = ARRAY_SIZE(k1_ccu_pll_hws),
+ .clk_hws = k1_ccu_pll_hws,
+ .clk_num = ARRAY_SIZE(k1_ccu_pll_hws),
};

static struct clk_hw *k1_ccu_mpmu_hws[] = {
@@ -860,8 +860,8 @@ static struct clk_hw *k1_ccu_mpmu_hws[] = {
};

static const struct spacemit_ccu_data k1_ccu_mpmu_data = {
- .hws = k1_ccu_mpmu_hws,
- .num = ARRAY_SIZE(k1_ccu_mpmu_hws),
+ .clk_hws = k1_ccu_mpmu_hws,
+ .clk_num = ARRAY_SIZE(k1_ccu_mpmu_hws),
};

static struct clk_hw *k1_ccu_apbc_hws[] = {
@@ -968,8 +968,8 @@ static struct clk_hw *k1_ccu_apbc_hws[] = {
};

static const struct spacemit_ccu_data k1_ccu_apbc_data = {
- .hws = k1_ccu_apbc_hws,
- .num = ARRAY_SIZE(k1_ccu_apbc_hws),
+ .clk_hws = k1_ccu_apbc_hws,
+ .clk_num = ARRAY_SIZE(k1_ccu_apbc_hws),
};

static struct clk_hw *k1_ccu_apmu_hws[] = {
@@ -1038,8 +1038,8 @@ static struct clk_hw *k1_ccu_apmu_hws[] = {
};

static const struct spacemit_ccu_data k1_ccu_apmu_data = {
- .hws = k1_ccu_apmu_hws,
- .num = ARRAY_SIZE(k1_ccu_apmu_hws),
+ .clk_hws = k1_ccu_apmu_hws,
+ .clk_num = ARRAY_SIZE(k1_ccu_apmu_hws),
};

static int spacemit_ccu_register(struct device *dev,
@@ -1050,13 +1050,13 @@ static int spacemit_ccu_register(struct device *dev,
struct clk_hw_onecell_data *clk_data;
int i, ret;

- clk_data = devm_kzalloc(dev, struct_size(clk_data, hws, data->num),
+ clk_data = devm_kzalloc(dev, struct_size(clk_data, hws, data->clk_num),
GFP_KERNEL);
if (!clk_data)
return -ENOMEM;

- for (i = 0; i < data->num; i++) {
- struct clk_hw *hw = data->hws[i];
+ for (i = 0; i < data->clk_num; i++) {
+ struct clk_hw *hw = data->clk_hws[i];
struct ccu_common *common;
const char *name;

@@ -1081,7 +1081,7 @@ static int spacemit_ccu_register(struct device *dev,
clk_data->hws[i] = hw;
}

- clk_data->num = data->num;
+ clk_data->num = data->clk_num;

ret = devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get, clk_data);
if (ret)