git.openwrt.org Git - openwrt/staging/stintel.git/blob

   1 From d3153113619216e87038a20bebf82582f9be10e7 Mon Sep 17 00:00:00 2001
   2 From: Varadarajan Narayanan <quic_varada@quicinc.com>
   3 Date: Tue, 30 Apr 2024 12:12:11 +0530
   4 Subject: [PATCH] interconnect: icc-clk: Add devm_icc_clk_register
   5
   6 Wrap icc_clk_register to create devm_icc_clk_register to be
   7 able to release the resources properly.
   8
   9 Acked-by: Georgi Djakov <djakov@kernel.org>
  10 Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
  11 Signed-off-by: Varadarajan Narayanan <quic_varada@quicinc.com>
  12 Link: https://lore.kernel.org/r/20240430064214.2030013-4-quic_varada@quicinc.com
  13 Signed-off-by: Bjorn Andersson <andersson@kernel.org>
  14 ---
  15  drivers/interconnect/icc-clk.c   | 18 ++++++++++++++++++
  16  include/linux/interconnect-clk.h |  2 ++
  17  2 files changed, 20 insertions(+)
  18
  19 diff --git a/drivers/interconnect/icc-clk.c b/drivers/interconnect/icc-clk.c
  20 index 2be193fd7d8f..f788db15cd76 100644
  21 --- a/drivers/interconnect/icc-clk.c
  22 +++ b/drivers/interconnect/icc-clk.c
  23 @@ -148,6 +148,24 @@ struct icc_provider *icc_clk_register(struct device *dev,
  24  }
  25  EXPORT_SYMBOL_GPL(icc_clk_register);
  26
  27 +static void devm_icc_release(void *res)
  28 +{
  29 +       icc_clk_unregister(res);
  30 +}
  31 +
  32 +int devm_icc_clk_register(struct device *dev, unsigned int first_id,
  33 +                         unsigned int num_clocks, const struct icc_clk_data *data)
  34 +{
  35 +       struct icc_provider *prov;
  36 +
  37 +       prov = icc_clk_register(dev, first_id, num_clocks, data);
  38 +       if (IS_ERR(prov))
  39 +               return PTR_ERR(prov);
  40 +
  41 +       return devm_add_action_or_reset(dev, devm_icc_release, prov);
  42 +}
  43 +EXPORT_SYMBOL_GPL(devm_icc_clk_register);
  44 +
  45  /**
  46   * icc_clk_unregister() - unregister a previously registered clk interconnect provider
  47   * @provider: provider returned by icc_clk_register()
  48 diff --git a/include/linux/interconnect-clk.h b/include/linux/interconnect-clk.h
  49 index 170898faaacb..9bcee3e9c56c 100644
  50 --- a/include/linux/interconnect-clk.h
  51 +++ b/include/linux/interconnect-clk.h
  52 @@ -19,6 +19,8 @@ struct icc_provider *icc_clk_register(struct device *dev,
  53                                       unsigned int first_id,
  54                                       unsigned int num_clocks,
  55                                       const struct icc_clk_data *data);
  56 +int devm_icc_clk_register(struct device *dev, unsigned int first_id,
  57 +                         unsigned int num_clocks, const struct icc_clk_data *data);
  58  void icc_clk_unregister(struct icc_provider *provider);
  59
  60  #endif
  61 --
  62 2.45.2
  63