• Arnd Bergmann's avatar
    clk: define to_clk_regmap() as inline function · 8d8c3131
    Arnd Bergmann authored
    Nesting container_of() causes warnings with W=2, which is
    annoying if it happens in headers and fills the build log
    like:
    
    In file included from drivers/clk/qcom/clk-alpha-pll.c:6:
    drivers/clk/qcom/clk-alpha-pll.c: In function 'clk_alpha_pll_hwfsm_enable':
    include/linux/kernel.h:852:8: warning: declaration of '__mptr' shadows a previous local [-Wshadow]
      852 |  void *__mptr = (void *)(ptr);     \
          |        ^~~~~~
    drivers/clk/qcom/clk-alpha-pll.c:155:31: note: in expansion of macro 'container_of'
      155 | #define to_clk_alpha_pll(_hw) container_of(to_clk_regmap(_hw), \
          |                               ^~~~~~~~~~~~
    drivers/clk/qcom/clk-regmap.h:27:28: note: in expansion of macro 'container_of'
       27 | #define to_clk_regmap(_hw) container_of(_hw, struct clk_regmap, hw)
          |                            ^~~~~~~~~~~~
    drivers/clk/qcom/clk-alpha-pll.c:155:44: note: in expansion of macro 'to_clk_regmap'
      155 | #define to_clk_alpha_pll(_hw) container_of(to_clk_regmap(_hw), \
          |                                            ^~~~~~~~~~~~~
    drivers/clk/qcom/clk-alpha-pll.c:254:30: note: in expansion of macro 'to_clk_alpha_pll'
      254 |  struct clk_alpha_pll *pll = to_clk_alpha_pll(hw);
          |                              ^~~~~~~~~~~~~~~~
    include/linux/kernel.h:852:8: note: shadowed declaration is here
      852 |  void *__mptr = (void *)(ptr);     \
          |        ^~~~~~
    
    Redefine two copies of the to_clk_regmap() macro as inline functions
    to avoid a lot of these.
    
    Fixes: ea11dda9 ("clk: meson: add regmap clocks")
    Fixes: 085d7a45 ("clk: qcom: Add a regmap type clock struct")
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    Link: https://lore.kernel.org/r/20201026161411.3708639-1-arnd@kernel.orgAcked-by: default avatarJerome Brunet <jbrunet@baylibre.com>
    Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
    8d8c3131
clk-regmap.h 3.61 KB