From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753929AbcHPNlR (ORCPT ); Tue, 16 Aug 2016 09:41:17 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:23628 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752434AbcHPNge (ORCPT ); Tue, 16 Aug 2016 09:36:34 -0400 X-AuditID: cbfec7f4-f796c6d000001486-6a-57b316dcff7f From: Krzysztof Kozlowski To: Michael Turquette , Stephen Boyd , Stephen Warren , Lee Jones , Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, Krzysztof Kozlowski , Sylwester Nawrocki , Tomasz Figa , Kukjin Kim , Russell King , Mark Brown , linux-clk@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-i2c@vger.kernel.org, alsa-devel@alsa-project.org Cc: Marek Szyprowski , Charles Keepax , Javier Martinez Canillas , a.hajda@samsung.com, Bartlomiej Zolnierkiewicz Subject: [RFC 01/17] clk: bcm2835: Rename clk_register to avoid name conflict Date: Tue, 16 Aug 2016 15:34:58 +0200 Message-id: <1471354514-24224-2-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1471354514-24224-1-git-send-email-k.kozlowski@samsung.com> References: <1471354514-24224-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrIIsWRmVeSWpSXmKPExsVy+t/xq7p3xDaHG7xZYWBxa905VosrFw8x WWycsZ7VYm3vURaLqQ+fsFn8m3KD3eJA42VGi1/vjrBbvHm7hsni9QtDi/7Hr5ktdrQtZLHY 9Pgaq8XHnnusFh1/vzBaXN41h81i4u0N7BYzzu9jsjg0dS+jxdojd9ktLp5ytXg6czObxeE3 7awWP850s1i8W/2E0eLVwTYWi1W7/jA6SHts+NzE5tH0/hibx+VrF5k93t9oZfeYdf8skNvX y+Sxc9Zddo9NqzrZPDYvqfd4OfE3m8eWfqBQ35ZVjB6fN8l5bJwbGsAXxWWTkpqTWZZapG+X wJVx9OUy1oKpvBWffr9lamBs4e5i5OCQEDCReN6g08XICWSKSVy4t54NxBYSWMoo8eBvVhcj F5DdyCTx7v0BZpAEm4CxxOblS9hAEiICq9gkFv5dywTiMAu8ZJQ4e/IXE0iVsICvxIcTtxhB bBYBVYkDr7aCjeUVcJdoWTKLHWKdnMTJY5NZQWxOAQ+JcxcamSFWu0ucXN/OMoGRdwEjwypG 0dTS5ILipPRcQ73ixNzi0rx0veT83E2MkIj7soNx8TGrQ4wCHIxKPLwnGTaFC7EmlhVX5h5i lOBgVhLhPSy6OVyINyWxsiq1KD++qDQntfgQozQHi5I479xd70OEBNITS1KzU1MLUotgskwc nFINjMarfog0tIZalP7fn7QiwdNzvo3jikMrxE7cXu52rJ3TYpJB18xV+z7J7vONXfZvWnfi wVyrBTeeFcaV1pu2fv+5NNOP4eWEWqPW/nsqE39PKpPsZmG+KfnAandg5iSTap49U33e7hfk 57R/fO7p1yJZVo++R7lLxLeJTnz4UNpK4pe4iDf3LiWW4oxEQy3mouJEALJI9ye0AgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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, -- 1.9.1