2011-02-22 21:24:42

by Andres Salomon

Subject: [PATCH] spi/spi_oc_tiny: fix build error

Fix the following build error due to a missing semicolon:

CC [M] drivers/spi/spi_oc_tiny.o
drivers/spi/spi_oc_tiny.c:394: error: expected ‘,’ or ‘;’ before ‘extern’
make[2]: *** [drivers/spi/spi_oc_tiny.o] Error 1

Signed-off-by: Andres Salomon <[email protected]>
---
drivers/spi/spi_oc_tiny.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/spi/spi_oc_tiny.c b/drivers/spi/spi_oc_tiny.c
index e99e545..f1bde66 100644
--- a/drivers/spi/spi_oc_tiny.c
+++ b/drivers/spi/spi_oc_tiny.c
@@ -390,7 +390,7 @@ static int __devexit tiny_spi_remove(struct platform_device *pdev)
static const struct of_device_id tiny_spi_match[] = {
{ .compatible = "opencores,tiny-spi-rtlsvn2", },
{},
-}
+};
MODULE_DEVICE_TABLE(of, tiny_spi_match);
#else /* CONFIG_OF */
#define tiny_spi_match NULL
--
1.7.2.3

2011-02-22 21:36:30

by Randy Dunlap

Subject: [PATCH] spi/spi_oc_tiny and spi_altera.c: fix build errors

On Tue, 22 Feb 2011 13:24:38 -0800 Andres Salomon wrote:

> Fix the following build error due to a missing semicolon:
>
> CC [M] drivers/spi/spi_oc_tiny.o
> drivers/spi/spi_oc_tiny.c:394: error: expected ‘,’ or ‘;’ before ‘extern’
> make[2]: *** [drivers/spi/spi_oc_tiny.o] Error 1
>
> Signed-off-by: Andres Salomon <[email protected]>

Acked-by: Randy Dunlap <[email protected]>

Same fix is needed for drivers/spi/spi_altera.c.
I already had this patch ready to send. Grant, can you extract
the spi_altera.c patch...?


---
From: Randy Dunlap <[email protected]>

Fix build error due to missing semi-colon:

drivers/spi/spi_altera.c:308: error: expected ',' or ';' before 'extern'
drivers/spi/spi_oc_tiny.c:394: error: expected ',' or ';' before 'extern'

Signed-off-by: Randy Dunlap <[email protected]>
---
drivers/spi/spi_altera.c | 2 +-
drivers/spi/spi_oc_tiny.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

--- linux-next-20110222.orig/drivers/spi/spi_oc_tiny.c
+++ linux-next-20110222/drivers/spi/spi_oc_tiny.c
@@ -390,7 +390,7 @@ static int __devexit tiny_spi_remove(str
static const struct of_device_id tiny_spi_match[] = {
{ .compatible = "opencores,tiny-spi-rtlsvn2", },
{},
-}
+};
MODULE_DEVICE_TABLE(of, tiny_spi_match);
#else /* CONFIG_OF */
#define tiny_spi_match NULL
--- linux-next-20110222.orig/drivers/spi/spi_altera.c
+++ linux-next-20110222/drivers/spi/spi_altera.c
@@ -304,7 +304,7 @@ static int __devexit altera_spi_remove(s
static const struct of_device_id altera_spi_match[] = {
{ .compatible = "ALTR,spi-1.0", },
{},
-}
+};
MODULE_DEVICE_TABLE(of, altera_spi_match);
#else /* CONFIG_OF */
#define altera_spi_match NULL

2011-02-22 22:02:32

by Grant Likely

Subject: Re: [PATCH] spi/spi_oc_tiny and spi_altera.c: fix build errors

On Tue, Feb 22, 2011 at 2:35 PM, Randy Dunlap <[email protected]> wrote:
> On Tue, 22 Feb 2011 13:24:38 -0800 Andres Salomon wrote:
>
>> Fix the following build error due to a missing semicolon:
>>
>> ?CC [M] ?drivers/spi/spi_oc_tiny.o
>> drivers/spi/spi_oc_tiny.c:394: error: expected ?,? or ?;? before ?extern?
>> make[2]: *** [drivers/spi/spi_oc_tiny.o] Error 1
>>
>> Signed-off-by: Andres Salomon <[email protected]>
>
> Acked-by: Randy Dunlap <[email protected]>
>
> Same fix is needed for drivers/spi/spi_altera.c.
> I already had this patch ready to send. ?Grant, can you extract
> the spi_altera.c patch...?

done. Will be pushed out when I finish testing.

g.


>
>
> ---
> From: Randy Dunlap <[email protected]>
>
> Fix build error due to missing semi-colon:
>
> drivers/spi/spi_altera.c:308: error: expected ',' or ';' before 'extern'
> drivers/spi/spi_oc_tiny.c:394: error: expected ',' or ';' before 'extern'
>
> Signed-off-by: Randy Dunlap <[email protected]>
> ---
> ?drivers/spi/spi_altera.c ?| ? ?2 +-
> ?drivers/spi/spi_oc_tiny.c | ? ?2 +-
> ?2 files changed, 2 insertions(+), 2 deletions(-)
>
> --- linux-next-20110222.orig/drivers/spi/spi_oc_tiny.c
> +++ linux-next-20110222/drivers/spi/spi_oc_tiny.c
> @@ -390,7 +390,7 @@ static int __devexit tiny_spi_remove(str
> ?static const struct of_device_id tiny_spi_match[] = {
> ? ? ? ?{ .compatible = "opencores,tiny-spi-rtlsvn2", },
> ? ? ? ?{},
> -}
> +};
> ?MODULE_DEVICE_TABLE(of, tiny_spi_match);
> ?#else /* CONFIG_OF */
> ?#define tiny_spi_match NULL
> --- linux-next-20110222.orig/drivers/spi/spi_altera.c
> +++ linux-next-20110222/drivers/spi/spi_altera.c
> @@ -304,7 +304,7 @@ static int __devexit altera_spi_remove(s
> ?static const struct of_device_id altera_spi_match[] = {
> ? ? ? ?{ .compatible = "ALTR,spi-1.0", },
> ? ? ? ?{},
> -}
> +};
> ?MODULE_DEVICE_TABLE(of, altera_spi_match);
> ?#else /* CONFIG_OF */
> ?#define altera_spi_match NULL
>
>



--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.