diff options
Diffstat (limited to 'arch/arm/mach-orion/gpio.c')
-rw-r--r-- | arch/arm/mach-orion/gpio.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-orion/gpio.c b/arch/arm/mach-orion/gpio.c index d5f00c86d616..f713818c66a3 100644 --- a/arch/arm/mach-orion/gpio.c +++ b/arch/arm/mach-orion/gpio.c | |||
@@ -36,7 +36,7 @@ int gpio_direction_input(unsigned pin) | |||
36 | unsigned long flags; | 36 | unsigned long flags; |
37 | 37 | ||
38 | if (pin >= GPIO_MAX || !test_bit(pin, gpio_valid)) { | 38 | if (pin >= GPIO_MAX || !test_bit(pin, gpio_valid)) { |
39 | pr_debug("%s: invalid GPIO %d\n", __FUNCTION__, pin); | 39 | pr_debug("%s: invalid GPIO %d\n", __func__, pin); |
40 | return -EINVAL; | 40 | return -EINVAL; |
41 | } | 41 | } |
42 | 42 | ||
@@ -62,7 +62,7 @@ int gpio_direction_output(unsigned pin, int value) | |||
62 | int mask; | 62 | int mask; |
63 | 63 | ||
64 | if (pin >= GPIO_MAX || !test_bit(pin, gpio_valid)) { | 64 | if (pin >= GPIO_MAX || !test_bit(pin, gpio_valid)) { |
65 | pr_debug("%s: invalid GPIO %d\n", __FUNCTION__, pin); | 65 | pr_debug("%s: invalid GPIO %d\n", __func__, pin); |
66 | return -EINVAL; | 66 | return -EINVAL; |
67 | } | 67 | } |
68 | 68 | ||
@@ -141,7 +141,7 @@ int gpio_request(unsigned pin, const char *label) | |||
141 | unsigned long flags; | 141 | unsigned long flags; |
142 | 142 | ||
143 | if (pin >= GPIO_MAX || !test_bit(pin, gpio_valid)) { | 143 | if (pin >= GPIO_MAX || !test_bit(pin, gpio_valid)) { |
144 | pr_debug("%s: invalid GPIO %d\n", __FUNCTION__, pin); | 144 | pr_debug("%s: invalid GPIO %d\n", __func__, pin); |
145 | return -EINVAL; | 145 | return -EINVAL; |
146 | } | 146 | } |
147 | 147 | ||
@@ -149,7 +149,7 @@ int gpio_request(unsigned pin, const char *label) | |||
149 | 149 | ||
150 | if (gpio_label[pin]) { | 150 | if (gpio_label[pin]) { |
151 | pr_debug("%s: GPIO %d already used as %s\n", | 151 | pr_debug("%s: GPIO %d already used as %s\n", |
152 | __FUNCTION__, pin, gpio_label[pin]); | 152 | __func__, pin, gpio_label[pin]); |
153 | ret = -EBUSY; | 153 | ret = -EBUSY; |
154 | } else | 154 | } else |
155 | gpio_label[pin] = label ? label : "?"; | 155 | gpio_label[pin] = label ? label : "?"; |
@@ -162,12 +162,12 @@ EXPORT_SYMBOL(gpio_request); | |||
162 | void gpio_free(unsigned pin) | 162 | void gpio_free(unsigned pin) |
163 | { | 163 | { |
164 | if (pin >= GPIO_MAX || !test_bit(pin, gpio_valid)) { | 164 | if (pin >= GPIO_MAX || !test_bit(pin, gpio_valid)) { |
165 | pr_debug("%s: invalid GPIO %d\n", __FUNCTION__, pin); | 165 | pr_debug("%s: invalid GPIO %d\n", __func__, pin); |
166 | return; | 166 | return; |
167 | } | 167 | } |
168 | 168 | ||
169 | if (!gpio_label[pin]) | 169 | if (!gpio_label[pin]) |
170 | pr_warning("%s: GPIO %d already freed\n", __FUNCTION__, pin); | 170 | pr_warning("%s: GPIO %d already freed\n", __func__, pin); |
171 | else | 171 | else |
172 | gpio_label[pin] = NULL; | 172 | gpio_label[pin] = NULL; |
173 | } | 173 | } |