During clk_register_*() API refactoring, macros will be used for hiding and narrowing the scope of changes thus leading to a name conflict with clk_register found in bcm2835 clk driver.
Signed-off-by: Krzysztof Kozlowski k.kozlowski@samsung.com --- drivers/clk/bcm/clk-bcm2835.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c index 7a7970865c2d..b77a8efbfce7 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -1262,12 +1262,12 @@ static struct clk *bcm2835_register_gate(struct bcm2835_cprman *cprman, typedef struct clk *(*bcm2835_clk_register)(struct bcm2835_cprman *cprman, const void *data); struct bcm2835_clk_desc { - bcm2835_clk_register clk_register; + bcm2835_clk_register bcm2835_clk_register; const void *data; };
/* assignment helper macros for different clock types */ -#define _REGISTER(f, ...) { .clk_register = (bcm2835_clk_register)f, \ +#define _REGISTER(f, ...) { .bcm2835_clk_register = (bcm2835_clk_register)f, \ .data = __VA_ARGS__ } #define REGISTER_PLL(...) _REGISTER(&bcm2835_register_pll, \ &(struct bcm2835_pll_data) \ @@ -1825,8 +1825,8 @@ static int bcm2835_clk_probe(struct platform_device *pdev)
for (i = 0; i < asize; i++) { desc = &clk_desc_array[i]; - if (desc->clk_register && desc->data) - clks[i] = desc->clk_register(cprman, desc->data); + if (desc->bcm2835_clk_register && desc->data) + clks[i] = desc->bcm2835_clk_register(cprman, desc->data); }
return of_clk_add_provider(dev->of_node, of_clk_src_onecell_get,