* [PATCH 1/3] sam9g20ek/9m10g45ek/stam9g20: unbreak build after 'use -EINVAL for invalid gpio'
@ 2011-10-06 15:39 Peter Korsgaard
2011-10-06 15:42 ` Peter Korsgaard
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Peter Korsgaard @ 2011-10-06 15:39 UTC (permalink / raw)
To: linux-arm-kernel
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 <jacmet@sunsite.dk>
---
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(-)
diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c
index 1c6dfbb..27943c2 100644
--- a/arch/arm/mach-at91/board-sam9g20ek.c
+++ b/arch/arm/mach-at91/board-sam9g20ek.c
@@ -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,
},
};
diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
index 3d68ead..008088a 100644
--- a/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@ -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,
},
};
diff --git a/arch/arm/mach-at91/board-stamp9g20.c b/arch/arm/mach-at91/board-stamp9g20.c
index 3c0cc86..cb4a840 100644
--- a/arch/arm/mach-at91/board-stamp9g20.c
+++ b/arch/arm/mach-at91/board-stamp9g20.c
@@ -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
--
1.7.6.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 1/3] sam9g20ek/9m10g45ek/stam9g20: unbreak build after 'use -EINVAL for invalid gpio'
2011-10-06 15:39 [PATCH 1/3] sam9g20ek/9m10g45ek/stam9g20: unbreak build after 'use -EINVAL for invalid gpio' Peter Korsgaard
@ 2011-10-06 15:42 ` Peter Korsgaard
2011-10-07 8:40 ` Nicolas Ferre
2011-10-07 10:31 ` [PATCH] " Nicolas Ferre
2 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2011-10-06 15:42 UTC (permalink / raw)
To: linux-arm-kernel
>>>>> "Peter" == Peter Korsgaard <jacmet@sunsite.dk> 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.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/3] sam9g20ek/9m10g45ek/stam9g20: unbreak build after 'use -EINVAL for invalid gpio'
2011-10-06 15:39 [PATCH 1/3] sam9g20ek/9m10g45ek/stam9g20: unbreak build after 'use -EINVAL for invalid gpio' Peter Korsgaard
2011-10-06 15:42 ` Peter Korsgaard
@ 2011-10-07 8:40 ` Nicolas Ferre
2011-10-07 10:31 ` [PATCH] " Nicolas Ferre
2 siblings, 0 replies; 4+ messages in thread
From: Nicolas Ferre @ 2011-10-07 8:40 UTC (permalink / raw)
To: linux-arm-kernel
On 10/06/2011 05:39 PM, Peter Korsgaard :
> 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 <jacmet@sunsite.dk>
OMG...
Thanks a lot Peter. I include it immediately in at91-l2 and at91-next!
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Best regards,
> ---
> 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(-)
>
> diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c
> index 1c6dfbb..27943c2 100644
> --- a/arch/arm/mach-at91/board-sam9g20ek.c
> +++ b/arch/arm/mach-at91/board-sam9g20ek.c
> @@ -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,
> },
>
> };
> diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
> index 3d68ead..008088a 100644
> --- a/arch/arm/mach-at91/board-sam9m10g45ek.c
> +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
> @@ -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,
> },
> };
>
> diff --git a/arch/arm/mach-at91/board-stamp9g20.c b/arch/arm/mach-at91/board-stamp9g20.c
> index 3c0cc86..cb4a840 100644
> --- a/arch/arm/mach-at91/board-stamp9g20.c
> +++ b/arch/arm/mach-at91/board-stamp9g20.c
> @@ -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
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] sam9g20ek/9m10g45ek/stam9g20: unbreak build after 'use -EINVAL for invalid gpio'
2011-10-06 15:39 [PATCH 1/3] sam9g20ek/9m10g45ek/stam9g20: unbreak build after 'use -EINVAL for invalid gpio' Peter Korsgaard
2011-10-06 15:42 ` Peter Korsgaard
2011-10-07 8:40 ` Nicolas Ferre
@ 2011-10-07 10:31 ` Nicolas Ferre
2 siblings, 0 replies; 4+ messages in thread
From: Nicolas Ferre @ 2011-10-07 10:31 UTC (permalink / raw)
To: linux-arm-kernel
From: Peter Korsgaard <jacmet@sunsite.dk>
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 <jacmet@sunsite.dk>
[nicolas.ferre at atmel.com: change also -1 to -EINVAL for coherency]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
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(-)
diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c
index b3ec5e6..52d122d 100644
--- a/arch/arm/mach-at91/board-sam9g20ek.c
+++ b/arch/arm/mach-at91/board-sam9g20ek.c
@@ -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
diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
index 3c36f9f..8e7d8ad 100644
--- a/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@ -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,
},
};
diff --git a/arch/arm/mach-at91/board-stamp9g20.c b/arch/arm/mach-at91/board-stamp9g20.c
index 3c0cc86..0bd51ee 100644
--- a/arch/arm/mach-at91/board-stamp9g20.c
+++ b/arch/arm/mach-at91/board-stamp9g20.c
@@ -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
--
1.7.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-10-07 10:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-06 15:39 [PATCH 1/3] sam9g20ek/9m10g45ek/stam9g20: unbreak build after 'use -EINVAL for invalid gpio' Peter Korsgaard
2011-10-06 15:42 ` Peter Korsgaard
2011-10-07 8:40 ` Nicolas Ferre
2011-10-07 10:31 ` [PATCH] " Nicolas Ferre
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).