Skip to contentSkip to conversation

sam9g20ek/9m10g45ek/stam9g20: unbreak build after 'use -EINVAL for invalid gpio'

PATCH New Peter Korsgaard 2 participants 4 messages Oct 6, 2011 – Oct 7, 2011

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm/Microchip (AT91) SoC support
lore
Share & tools
lore

Peter Korsgaard

author
#0 lore raw

PATCH 1/3 sam9g20ek/9m10g45ek/stam9g20: unbreak build after 'use -EINVAL for invalid gpio'

Commit 36706ab70b26 (ARM: at91/boards: use -EINVAL for invalid gpio) broke the build as it used ';' rather than ',' in structure initializers.

Signed-off-by Peter Korsgaard <[email protected]>
---
 arch/arm/mach-at91/board-sam9g20ek.c    |    2 +-
 arch/arm/mach-at91/board-sam9m10g45ek.c |    2 +-
 arch/arm/mach-at91/board-stamp9g20.c    |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-at91/board-sam9g20ek.c +1 -1
index 1c6dfbb..27943c2 100644
@@ -212,7 +212,7 @@ static struct mci_platform_data __initdata ek_mmc_data = {
 	.slot[1] = {
 		.bus_width	= 4,
 		.detect_pin	= AT91_PIN_PC9,
-		.wp_pin		= -1;
+		.wp_pin		= -1,
 	},
 
 };
arch/arm/mach-at91/board-sam9m10g45ek.c +1 -1
index 3d68ead..008088a 100644
@@ -100,7 +100,7 @@ static struct mci_platform_data __initdata mci0_data = {
 	.slot[0] = {
 		.bus_width	= 4,
 		.detect_pin	= AT91_PIN_PD10,
-		.wp_pin		= -1;
+		.wp_pin		= -1,
 	},
 };
arch/arm/mach-at91/board-stamp9g20.c +2 -2
index 3c0cc86..cb4a840 100644
@@ -123,8 +123,8 @@ static void __init add_device_nand(void)
 static struct mci_platform_data __initdata mmc_data = {
 	.slot[0] = {
 		.bus_width	= 4,
-		.detect_pin	= -1;
-		.wp_pin		= -1;
+		.detect_pin	= -1,
+		.wp_pin		= -1,
 	},
 };
 #else
Signature · 1 line
1.7.6.3
author
#1 lore raw

PATCH 1/3 sam9g20ek/9m10g45ek/stam9g20: unbreak build after 'use -EINVAL for invalid gpio'

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

Peter> Commit 36706ab70b26 (ARM: at91/boards: use -EINVAL for invalid gpio) Peter> broke the build as it used ';' rather than ',' in structure initializers.

Ups, ignore the 1/3 part, this is the only patch in this series.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/3 sam9g20ek/9m10g45ek/stam9g20: unbreak build after 'use -EINVAL for invalid gpio'

In reply to Peter Korsgaard

On 10/06/2011 05:39 PM, Peter Korsgaard :

Quoted 4 lines

Commit 36706ab70b26 (ARM: at91/boards: use -EINVAL for invalid gpio) broke the build as it used ';' rather than ',' in structure initializers.

Signed-off-by Peter Korsgaard <[email protected]>

OMG...

Thanks a lot Peter. I include it immediately in at91-l2 and at91-next!

Signed-off-by Nicolas Ferre <[email protected]>

Best regards,

Quoted 47 lines
---
 arch/arm/mach-at91/board-sam9g20ek.c    |    2 +-
 arch/arm/mach-at91/board-sam9m10g45ek.c |    2 +-
 arch/arm/mach-at91/board-stamp9g20.c    |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-at91/board-sam9g20ek.c +1 -1
index 1c6dfbb..27943c2 100644
@@ -212,7 +212,7 @@ static struct mci_platform_data __initdata ek_mmc_data = {
 	.slot[1] = {
 		.bus_width	= 4,
 		.detect_pin	= AT91_PIN_PC9,
-		.wp_pin		= -1;
+		.wp_pin		= -1,
 	},
 
 };
arch/arm/mach-at91/board-sam9m10g45ek.c +1 -1
index 3d68ead..008088a 100644
@@ -100,7 +100,7 @@ static struct mci_platform_data __initdata mci0_data = {
 	.slot[0] = {
 		.bus_width	= 4,
 		.detect_pin	= AT91_PIN_PD10,
-		.wp_pin		= -1;
+		.wp_pin		= -1,
 	},
 };
arch/arm/mach-at91/board-stamp9g20.c +2 -2
index 3c0cc86..cb4a840 100644
@@ -123,8 +123,8 @@ static void __init add_device_nand(void)
 static struct mci_platform_data __initdata mmc_data = {
 	.slot[0] = {
 		.bus_width	= 4,
-		.detect_pin	= -1;
-		.wp_pin		= -1;
+		.detect_pin	= -1,
+		.wp_pin		= -1,
 	},
 };
 #else
Signature · 1 line
Nicolas Ferre
#3 lore raw

PATCH 1/1 sam9g20ek/9m10g45ek/stam9g20: unbreak build after 'use -EINVAL for invalid gpio'

In reply to Peter Korsgaard

From: Peter Korsgaard <[email protected]>

Commit 36706ab70b26 (ARM: at91/boards: use -EINVAL for invalid gpio) broke the build as it used ';' rather than ',' in structure initializers.

Signed-off-by Peter Korsgaard <[email protected]>
[[email protected]: change also -1 to -EINVAL for coherency]
Signed-off-by Nicolas Ferre <[email protected]>
---
 arch/arm/mach-at91/board-sam9g20ek.c    |    4 ++--
 arch/arm/mach-at91/board-sam9m10g45ek.c |    2 +-
 arch/arm/mach-at91/board-stamp9g20.c    |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-at91/board-sam9g20ek.c +2 -2
index b3ec5e6..52d122d 100644
@@ -217,7 +217,7 @@ static struct mci_platform_data __initdata ek_mmc_data = {
 	.slot[1] = {
 		.bus_width	= 4,
 		.detect_pin	= AT91_PIN_PC9,
-		.wp_pin		= -1;
+		.wp_pin		= -EINVAL,
 	},
 
 };

@@ -237,7 +237,7 @@ static void __init ek_add_device_mmc(void)
 	if (ek_have_2mmc()) {
 		ek_mmc_data.slot[0].bus_width = 4;
 		ek_mmc_data.slot[0].detect_pin = AT91_PIN_PC2;
-		ek_mmc_data.slot[0].wp_pin = -1;
+		ek_mmc_data.slot[0].wp_pin = -EINVAL;
 	}
 	at91_add_device_mci(0, &ek_mmc_data);
 #else
arch/arm/mach-at91/board-sam9m10g45ek.c +1 -1
index 3c36f9f..8e7d8ad 100644
@@ -100,7 +100,7 @@ static struct mci_platform_data __initdata mci0_data = {
 	.slot[0] = {
 		.bus_width	= 4,
 		.detect_pin	= AT91_PIN_PD10,
-		.wp_pin		= -1;
+		.wp_pin		= -EINVAL,
 	},
 };
arch/arm/mach-at91/board-stamp9g20.c +2 -2
index 3c0cc86..0bd51ee 100644
@@ -123,8 +123,8 @@ static void __init add_device_nand(void)
 static struct mci_platform_data __initdata mmc_data = {
 	.slot[0] = {
 		.bus_width	= 4,
-		.detect_pin	= -1;
-		.wp_pin		= -1;
+		.detect_pin	= -EINVAL,
+		.wp_pin		= -EINVAL,
 	},
 };
 #else
Signature · 1 line
1.7.3