firmware: samsung: acpm: Drop redundant _ops suffix in acpm_ops members

Rename the `dvfs_ops` and `pmic_ops` members of `struct acpm_ops` to
`dvfs` and `pmic` respectively.

Since these members are housed within the `acpm_ops` structure and
utilize the `acpm_*_ops` types, the `_ops` suffix on the variable names
creates unnecessary redundancy (e.g., `handle.ops.dvfs_ops`).

This cleanup removes the stuttering, leading to cleaner consumer code.

Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
Reviewed-by: Peter Griffin <peter.griffin@linaro.org>
Acked-by: Lee Jones <lee@kernel.org>
Link: https://lore.kernel.org/linux-samsung-soc/CADrjBPqzKpcd9vuCmNUptCUPyPpPbHcc19-7kN-1c0RpW1e5DQ@mail.gmail.com/T/#mcce154a7e0c6cd1ca6cd5a1e37541ed7a85a84d4
Link: https://patch.msgid.link/20260515-acpm-tmu-helpers-v2-3-8ca011d5a965@linaro.org
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/drivers/clk/samsung/clk-acpm.c b/drivers/clk/samsung/clk-acpm.c
index d8944160793a07e763f7b12451214d57b063792d..93667777094c626a058a13b5024befc70c41b276 100644 (file)
--- a/drivers/clk/samsung/clk-acpm.c
+++ b/drivers/clk/samsung/clk-acpm.c
@@ -68,8 +68,8 @@ static unsigned long acpm_clk_recalc_rate(struct clk_hw *hw,
 {
        struct acpm_clk *clk = to_acpm_clk(hw);
 
-       return clk->handle->ops.dvfs_ops.get_rate(clk->handle,
-                                       clk->mbox_chan_id, clk->id);
+       return clk->handle->ops.dvfs.get_rate(clk->handle, clk->mbox_chan_id,
+                                             clk->id);
 }
 
 static int acpm_clk_determine_rate(struct clk_hw *hw,
@@ -89,8 +89,8 @@ static int acpm_clk_set_rate(struct clk_hw *hw, unsigned long rate,
 {
        struct acpm_clk *clk = to_acpm_clk(hw);
 
-       return clk->handle->ops.dvfs_ops.set_rate(clk->handle,
-                                       clk->mbox_chan_id, clk->id, rate);
+       return clk->handle->ops.dvfs.set_rate(clk->handle, clk->mbox_chan_id,
+                                             clk->id, rate);
 }
 
 static const struct clk_ops acpm_clk_ops = {

diff --git a/drivers/firmware/samsung/exynos-acpm.c b/drivers/firmware/samsung/exynos-acpm.c
index 69bb1008d1c0ffa33d9d1f832858b3e7e5e62070..bd2bfd8d85129992331ed5ffd189e12cc6731608 100644 (file)
--- a/drivers/firmware/samsung/exynos-acpm.c
+++ b/drivers/firmware/samsung/exynos-acpm.c
@@ -672,8 +672,8 @@ static int acpm_channels_init(struct acpm_info *acpm)
  */
 static void acpm_setup_ops(struct acpm_info *acpm)
 {
-       struct acpm_dvfs_ops *dvfs_ops = &acpm->handle.ops.dvfs_ops;
-       struct acpm_pmic_ops *pmic_ops = &acpm->handle.ops.pmic_ops;
+       struct acpm_dvfs_ops *dvfs_ops = &acpm->handle.ops.dvfs;
+       struct acpm_pmic_ops *pmic_ops = &acpm->handle.ops.pmic;
 
        dvfs_ops->set_rate = acpm_dvfs_set_rate;
        dvfs_ops->get_rate = acpm_dvfs_get_rate;

diff --git a/drivers/mfd/sec-acpm.c b/drivers/mfd/sec-acpm.c
index 0e23b9d9f7ee723f791b697842994ac1c2f319cb..9e15b260b8dfd8a02fc92b6083de1a1ff41506ed 100644 (file)
--- a/drivers/mfd/sec-acpm.c
+++ b/drivers/mfd/sec-acpm.c
@@ -391,7 +391,7 @@ static int sec_pmic_acpm_bus_write(void *context, const void *data,
 {
        struct sec_pmic_acpm_bus_context *ctx = context;
        struct acpm_handle *acpm = ctx->shared->acpm;
-       const struct acpm_pmic_ops *pmic_ops = &acpm->ops.pmic_ops;
+       const struct acpm_pmic_ops *pmic_ops = &acpm->ops.pmic;
        size_t val_count = count - BITS_TO_BYTES(ACPM_ADDR_BITS);
        const u8 *d = data;
        const u8 *vals = &d[BITS_TO_BYTES(ACPM_ADDR_BITS)];
@@ -411,7 +411,7 @@ static int sec_pmic_acpm_bus_read(void *context, const void *reg_buf, size_t reg
 {
        struct sec_pmic_acpm_bus_context *ctx = context;
        struct acpm_handle *acpm = ctx->shared->acpm;
-       const struct acpm_pmic_ops *pmic_ops = &acpm->ops.pmic_ops;
+       const struct acpm_pmic_ops *pmic_ops = &acpm->ops.pmic;
        const u8 *r = reg_buf;
        u8 reg;
 
@@ -430,7 +430,7 @@ static int sec_pmic_acpm_bus_reg_update_bits(void *context, unsigned int reg, un
 {
        struct sec_pmic_acpm_bus_context *ctx = context;
        struct acpm_handle *acpm = ctx->shared->acpm;
-       const struct acpm_pmic_ops *pmic_ops = &acpm->ops.pmic_ops;
+       const struct acpm_pmic_ops *pmic_ops = &acpm->ops.pmic;
 
        return pmic_ops->update_reg(acpm, ctx->shared->acpm_chan_id, ctx->type, reg & 0xff,
                                    ctx->shared->speedy_channel, val, mask);

diff --git a/include/linux/firmware/samsung/exynos-acpm-protocol.h b/include/linux/firmware/samsung/exynos-acpm-protocol.h
index 13f17dc4443b8f470f822b9358d404433bdbda0f..62a3eb450067d2b678dad2d8c070245058c78a93 100644 (file)
--- a/include/linux/firmware/samsung/exynos-acpm-protocol.h
+++ b/include/linux/firmware/samsung/exynos-acpm-protocol.h
@@ -35,8 +35,8 @@ struct acpm_pmic_ops {
 };
 
 struct acpm_ops {
-       struct acpm_dvfs_ops dvfs_ops;
-       struct acpm_pmic_ops pmic_ops;
+       struct acpm_dvfs_ops dvfs;
+       struct acpm_pmic_ops pmic;
 };
 
 /**