mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
8d8c313124
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: ea11dda9e0 ("clk: meson: add regmap clocks")
Fixes: 085d7a4554 ("clk: qcom: Add a regmap type clock struct")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20201026161411.3708639-1-arnd@kernel.org
Acked-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
38 lines
1.1 KiB
C
38 lines
1.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/* Copyright (c) 2014, The Linux Foundation. All rights reserved. */
|
|
|
|
#ifndef __QCOM_CLK_REGMAP_H__
|
|
#define __QCOM_CLK_REGMAP_H__
|
|
|
|
#include <linux/clk-provider.h>
|
|
|
|
struct regmap;
|
|
|
|
/**
|
|
* struct clk_regmap - regmap supporting clock
|
|
* @hw: handle between common and hardware-specific interfaces
|
|
* @regmap: regmap to use for regmap helpers and/or by providers
|
|
* @enable_reg: register when using regmap enable/disable ops
|
|
* @enable_mask: mask when using regmap enable/disable ops
|
|
* @enable_is_inverted: flag to indicate set enable_mask bits to disable
|
|
* when using clock_enable_regmap and friends APIs.
|
|
*/
|
|
struct clk_regmap {
|
|
struct clk_hw hw;
|
|
struct regmap *regmap;
|
|
unsigned int enable_reg;
|
|
unsigned int enable_mask;
|
|
bool enable_is_inverted;
|
|
};
|
|
|
|
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);
|
|
void clk_disable_regmap(struct clk_hw *hw);
|
|
int devm_clk_register_regmap(struct device *dev, struct clk_regmap *rclk);
|
|
|
|
#endif
|