clk: define to_clk_regmap() as inline function
Subsystems (5)
PATCH 1/1 clk: define to_clk_regmap() as inline function
From: Arnd Bergmann <[email protected]>
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.
--- drivers/clk/meson/clk-regmap.h | 5 ++++- drivers/clk/qcom/clk-regmap.h | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/clk/meson/clk-regmap.h +4 -1
@@ -26,7 +26,10 @@ struct clk_regmap {void *data; }; -#define to_clk_regmap (_hw) container_of(_hw, struct clk_regmap, hw) +static inline struct clk_regmap *to_clk_regmap (struct clk_hw *hw) +{ + return container_of(hw, struct clk_regmap, hw); +}/** * struct clk_regmap_gate_data - regmap backed gate specific data
drivers/clk/qcom/clk-regmap.h +5 -1
@@ -24,7 +24,11 @@ struct clk_regmap {unsigned int enable_mask;bool enable_is_inverted; }; -#define to_clk_regmap (_hw) container_of(_hw, struct clk_regmap, hw) + +static inline struct clk_regmap *to_clk_regmap (struct clk_hw *hw) +{ + return container_of(hw, struct clk_regmap, hw); +}int clk_is_enabled_regmap (struct clk_hw *hw);int clk_enable_regmap (struct clk_hw *hw);
Signature · 1 line
2.27.0
Quoted 27 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
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 | #defineto_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); \ | ^~~~~~
Quoted 6 lines
Redefine two copies of the
to_clk_regmap()macro as inline functions to avoid a lot of these.Fixes ea11dda9e091 ("clk: meson: add regmap clocks")Fixes 085d7a455444 ("clk: qcom: Add a regmap type clock struct")Signed-off-by Arnd Bergmann <[email protected]>
Quoted 38 lines
--- drivers/clk/meson/clk-regmap.h | 5 ++++- drivers/clk/qcom/clk-regmap.h | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-)drivers/clk/meson/clk-regmap.h +4
-1@@ -26,7 +26,10 @@ struct clk_regmap {void *data; }; -#define to_clk_regmap (_hw) container_of(_hw, struct clk_regmap, hw) +static inline struct clk_regmap *to_clk_regmap (struct clk_hw *hw) +{ + return container_of(hw, struct clk_regmap, hw); +}/** * struct clk_regmap_gate_data - regmap backed gate specific data drivers/clk/qcom/clk-regmap.h +5
-1@@ -24,7 +24,11 @@ struct clk_regmap {unsigned int enable_mask;bool enable_is_inverted; }; -#define to_clk_regmap (_hw) container_of(_hw, struct clk_regmap, hw) + +static inline struct clk_regmap *to_clk_regmap (struct clk_hw *hw) +{ + return container_of(hw, struct clk_regmap, hw); +}int clk_is_enabled_regmap (struct clk_hw *hw);int clk_enable_regmap (struct clk_hw *hw);
Quoting Arnd Bergmann (2020-10-26 09:13:57)
Quoted 27 lines
From: Arnd Bergmann <[email protected]>
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 | #defineto_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); \ | ^~~~~~
Quoted 7 lines
Redefine two copies of the
to_clk_regmap()macro as inline functions to avoid a lot of these.Fixes ea11dda9e091 ("clk: meson: add regmap clocks")Fixes 085d7a455444 ("clk: qcom: Add a regmap type clock struct")Signed-off-by Arnd Bergmann <[email protected]>---
Applied to clk-fixes
_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
This patch was applied to qcom/linux.git (refs/heads/for-next):
Hello:
This patch was applied to qcom/linux.git (refs/heads/for-next):
Quoted 21 lines · On Mon, 26 Oct 2020 17:13:57 +0100 you wrote:
From: Arnd Bergmann <[email protected]>
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 | #defineto_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'
Quoted 7 lines
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); \ | ^~~~~~[...]
Here is the summary with links:
- clk: define to_clk_regmap() as inline function
https://git.kernel.org/qcom/c/8d8c3131248d
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html