Upstream review led to a request to remove the #define name_to_gpio name_to_gpio macro. Rename the function to sunxi_name_to_gpio and #define name_to_gpio to that.
Signed-off-by: Ian Campbell <[email protected]> --- name_to_gpio will eventually become a weak function upstream, at which point we can switch to using that instead of the #define. --- arch/arm/include/asm/arch-sunxi/gpio.h | 4 ++-- drivers/gpio/sunxi_gpio.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h index 802f347..c368adb 100644 --- a/arch/arm/include/asm/arch-sunxi/gpio.h +++ b/arch/arm/include/asm/arch-sunxi/gpio.h @@ -139,7 +139,7 @@ int sunxi_gpio_set_cfgpin(u32 pin, u32 val); int sunxi_gpio_get_cfgpin(u32 pin); int sunxi_gpio_set_drv(u32 pin, u32 val); int sunxi_gpio_set_pull(u32 pin, u32 val); -int name_to_gpio(const char *name); -#define name_to_gpio name_to_gpio +int sunxi_name_to_gpio(const char *name); +#define name_to_gpio(name) sunxi_name_to_gpio(name) #endif /* _SUNXI_GPIO_H */ diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c index 188ece6..5434da1 100644 --- a/drivers/gpio/sunxi_gpio.c +++ b/drivers/gpio/sunxi_gpio.c @@ -81,7 +81,7 @@ int gpio_set_value(unsigned gpio, int value) return sunxi_gpio_output(gpio, value); } -int name_to_gpio(const char *name) +int sunxi_name_to_gpio(const char *name) { int group = 0; int groupsize = 9 * 32; -- 1.9.0 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
