diff options
Diffstat (limited to 'arch/arm/mach-davinci/include/mach/gpio.h')
-rw-r--r-- | arch/arm/mach-davinci/include/mach/gpio.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/include/mach/gpio.h b/arch/arm/mach-davinci/include/mach/gpio.h index f3b8ef878158..0099e6e5aff8 100644 --- a/arch/arm/mach-davinci/include/mach/gpio.h +++ b/arch/arm/mach-davinci/include/mach/gpio.h | |||
@@ -67,10 +67,10 @@ struct gpio_controller { | |||
67 | * | 67 | * |
68 | * These are NOT part of the cross-platform GPIO interface | 68 | * These are NOT part of the cross-platform GPIO interface |
69 | */ | 69 | */ |
70 | static inline struct gpio_controller *__iomem | 70 | static inline struct gpio_controller __iomem * |
71 | __gpio_to_controller(unsigned gpio) | 71 | __gpio_to_controller(unsigned gpio) |
72 | { | 72 | { |
73 | void *__iomem ptr; | 73 | void __iomem *ptr; |
74 | void __iomem *base = davinci_soc_info.gpio_base; | 74 | void __iomem *base = davinci_soc_info.gpio_base; |
75 | 75 | ||
76 | if (gpio < 32 * 1) | 76 | if (gpio < 32 * 1) |
@@ -102,7 +102,7 @@ static inline u32 __gpio_mask(unsigned gpio) | |||
102 | static inline void gpio_set_value(unsigned gpio, int value) | 102 | static inline void gpio_set_value(unsigned gpio, int value) |
103 | { | 103 | { |
104 | if (__builtin_constant_p(value) && gpio < DAVINCI_N_GPIO) { | 104 | if (__builtin_constant_p(value) && gpio < DAVINCI_N_GPIO) { |
105 | struct gpio_controller *__iomem g; | 105 | struct gpio_controller __iomem *g; |
106 | u32 mask; | 106 | u32 mask; |
107 | 107 | ||
108 | g = __gpio_to_controller(gpio); | 108 | g = __gpio_to_controller(gpio); |
@@ -128,7 +128,7 @@ static inline void gpio_set_value(unsigned gpio, int value) | |||
128 | */ | 128 | */ |
129 | static inline int gpio_get_value(unsigned gpio) | 129 | static inline int gpio_get_value(unsigned gpio) |
130 | { | 130 | { |
131 | struct gpio_controller *__iomem g; | 131 | struct gpio_controller __iomem *g; |
132 | 132 | ||
133 | if (!__builtin_constant_p(gpio) || gpio >= DAVINCI_N_GPIO) | 133 | if (!__builtin_constant_p(gpio) || gpio >= DAVINCI_N_GPIO) |
134 | return __gpio_get_value(gpio); | 134 | return __gpio_get_value(gpio); |