[PATCH 3/6] firmware: samsung: acpm: Drop redundant _ops suffix in acpm_ops members

[Peter Griffin]

On Wed, 6 May 2026 at 12:39, Tudor Ambarus <tudor.ambarus at linaro.org> wrote:
>
> 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 at linaro.org>
> ---

Reviewed-by: Peter Griffin <peter.griffin at linaro.org>

>  drivers/clk/samsung/clk-acpm.c                        | 8 ++++----
>  drivers/firmware/samsung/exynos-acpm.c                | 4 ++--
>  drivers/mfd/sec-acpm.c                                | 6 +++---
>  include/linux/firmware/samsung/exynos-acpm-protocol.h | 4 ++--
>  4 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/clk/samsung/clk-acpm.c b/drivers/clk/samsung/clk-acpm.c
> index d8944160793a..93667777094c 100644
> --- 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 fac88c427d2a..da960d3e1145 100644
> --- a/drivers/firmware/samsung/exynos-acpm.c
> +++ b/drivers/firmware/samsung/exynos-acpm.c
> @@ -676,8 +676,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 0e23b9d9f7ee..9e15b260b8df 100644
> --- 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 d4db2796a6fb..b206efa62be6 100644
> --- a/include/linux/firmware/samsung/exynos-acpm-protocol.h
> +++ b/include/linux/firmware/samsung/exynos-acpm-protocol.h
> @@ -36,8 +36,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;
>  };
>
>  /**
>
> --
> 2.54.0.545.g6539524ca2-goog
>