Skip to contentSkip to conversation

mpc85xx: gpio related compiler error fix when build common/cmd_gpio.c

PATCH New Oleksandr G Zhadan 2 participants 2 messages Apr 15, 2015 – Apr 28, 2015 PowerPC

lore
Share & tools
lore

Oleksandr G Zhadan

author
#0 lore raw

PATCH 1/1 mpc85xx: gpio related compiler error fix when build common/cmd_gpio.c

1. Include asm/mpc85xx_gpio.h into asm/gpio.h
2. Fix Incompatibility in functions gpio_free() and gpio_set_value() definitions between <asm/mpc85xx_gpio.h> and <asm-generic/gpio.h>

Signed-off-by Michael Durrant <[email protected]>
Signed-off-by Oleksandr G Zhadan <[email protected]>

---

 arch/powerpc/include/asm/arch-mpc85xx/gpio.h | 2 ++
 arch/powerpc/include/asm/mpc85xx_gpio.h      | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/arch-mpc85xx/gpio.h +2 -0
index 8beed30..71794a8 100644
@@ -12,4 +12,6 @@
 #ifndef __ASM_ARCH_MX85XX_GPIO_H
 #define __ASM_ARCH_MX85XX_GPIO_H
 
+#include <asm/mpc85xx_gpio.h>
+
 #endif
arch/powerpc/include/asm/mpc85xx_gpio.h +4 -2
index 87bb4a0..1d0dad4 100644
@@ -72,9 +72,10 @@ static inline int gpio_request(unsigned gpio, const char *label)
 	return 0;
 }
 
-static inline void gpio_free(unsigned gpio)
+static inline int gpio_free(unsigned gpio)
 {
 	/* Compatibility shim */
+	return 0;
 }
 
 static inline int gpio_direction_input(unsigned gpio)

@@ -97,12 +98,13 @@ static inline int gpio_get_value(unsigned gpio)
 	return !!mpc85xx_gpio_get(1U << gpio);
 }
 
-static inline void gpio_set_value(unsigned gpio, int value)
+static inline int gpio_set_value(unsigned gpio, int value)
 {
 	if (value)
 		mpc85xx_gpio_set_high(1U << gpio);
 	else
 		mpc85xx_gpio_set_low(1U << gpio);
+	return 0;
 }
 
 static inline int gpio_is_valid(int gpio)
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 mpc85xx: gpio related compiler error fix when build common/cmd_gpio.c

Oleks,

Suggest to change subject to "powerpc/mpc85xx: Fix compiling error for common/cmd_gpio.c".

It would be helpful to put the compiling error into commit message.

Quoted 2 lines · Oleksandr G Zhadan

1. Include asm/mpc85xx_gpio.h into asm/gpio.h
2. Fix Incompatibility in functions gpio_free() and gpio_set_value() definitions between <asm/mpc85xx_gpio.h> and <asm-generic/gpio.h>

Please wrap back at about 65-70 characters.

York