2021-02-04 15:54:01

by Arnd Bergmann

Subject: [PATCH] drivers: soc: atmel: fix type for same7

From: Arnd Bergmann <[email protected]>

A missing comma caused a build failure:

drivers/soc/atmel/soc.c:196:24: error: too few arguments provided to function-like macro invocation

Fixes: af3a10513cd6 ("drivers: soc: atmel: add per soc id and version match masks")
Signed-off-by: Arnd Bergmann <[email protected]>
---
It is broken in the soc tree at the moment, I can pick up
the fix directly if I get an Ack
---
drivers/soc/atmel/soc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/soc/atmel/soc.c b/drivers/soc/atmel/soc.c
index a2967846809f..a490ad7e090f 100644
--- a/drivers/soc/atmel/soc.c
+++ b/drivers/soc/atmel/soc.c
@@ -191,7 +191,7 @@ static const struct at91_soc socs[] __initconst = {
AT91_SOC(SAME70Q20_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
AT91_CIDR_VERSION_MASK, SAME70Q20_EXID_MATCH,
"same70q20", "same7"),
- AT91_SOC(SAME70Q19_CIDR_MATCH, AT91_CIDR_MATCH_MASK
+ AT91_SOC(SAME70Q19_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
AT91_CIDR_VERSION_MASK, SAME70Q19_EXID_MATCH,
"same70q19", "same7"),
AT91_SOC(SAMS70Q21_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
--
2.29.2

2021-02-04 15:58:42

by Alexandre Belloni

Subject: Re: [PATCH] drivers: soc: atmel: fix type for same7

On 04/02/2021 16:49:25+0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> A missing comma caused a build failure:
>
> drivers/soc/atmel/soc.c:196:24: error: too few arguments provided to function-like macro invocation
>
> Fixes: af3a10513cd6 ("drivers: soc: atmel: add per soc id and version match masks")
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Alexandre Belloni <[email protected]>

> ---
> It is broken in the soc tree at the moment, I can pick up
> the fix directly if I get an Ack
> ---
> drivers/soc/atmel/soc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/soc/atmel/soc.c b/drivers/soc/atmel/soc.c
> index a2967846809f..a490ad7e090f 100644
> --- a/drivers/soc/atmel/soc.c
> +++ b/drivers/soc/atmel/soc.c
> @@ -191,7 +191,7 @@ static const struct at91_soc socs[] __initconst = {
> AT91_SOC(SAME70Q20_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
> AT91_CIDR_VERSION_MASK, SAME70Q20_EXID_MATCH,
> "same70q20", "same7"),
> - AT91_SOC(SAME70Q19_CIDR_MATCH, AT91_CIDR_MATCH_MASK
> + AT91_SOC(SAME70Q19_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
> AT91_CIDR_VERSION_MASK, SAME70Q19_EXID_MATCH,
> "same70q19", "same7"),
> AT91_SOC(SAMS70Q21_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
> --
> 2.29.2
>

--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

2021-02-05 01:10:04

by Nicolas Ferre

Subject: Re: [PATCH] drivers: soc: atmel: fix type for same7

On 04/02/2021 at 16:52, Alexandre Belloni wrote:
> On 04/02/2021 16:49:25+0100, Arnd Bergmann wrote:
>> From: Arnd Bergmann <[email protected]>
>>
>> A missing comma caused a build failure:
>>
>> drivers/soc/atmel/soc.c:196:24: error: too few arguments provided to function-like macro invocation
>>
>> Fixes: af3a10513cd6 ("drivers: soc: atmel: add per soc id and version match masks")
>> Signed-off-by: Arnd Bergmann <[email protected]>
> Acked-by: Alexandre Belloni <[email protected]>

Thanks Arnd, thanks Alexandre.

As you realized, we didn't compiled with MMU-less types of configuration
(CONFIG_SOC_SAMV7), sorry about that!

Best regards,
Nicolas

>> ---
>> It is broken in the soc tree at the moment, I can pick up
>> the fix directly if I get an Ack
>> ---
>> drivers/soc/atmel/soc.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/soc/atmel/soc.c b/drivers/soc/atmel/soc.c
>> index a2967846809f..a490ad7e090f 100644
>> --- a/drivers/soc/atmel/soc.c
>> +++ b/drivers/soc/atmel/soc.c
>> @@ -191,7 +191,7 @@ static const struct at91_soc socs[] __initconst = {
>> AT91_SOC(SAME70Q20_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
>> AT91_CIDR_VERSION_MASK, SAME70Q20_EXID_MATCH,
>> "same70q20", "same7"),
>> - AT91_SOC(SAME70Q19_CIDR_MATCH, AT91_CIDR_MATCH_MASK
>> + AT91_SOC(SAME70Q19_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
>> AT91_CIDR_VERSION_MASK, SAME70Q19_EXID_MATCH,
>> "same70q19", "same7"),
>> AT91_SOC(SAMS70Q21_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
>> --
>> 2.29.2
>>
>
> --
> Alexandre Belloni, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
>


--
Nicolas Ferre

2021-02-10 01:33:42

by Arnd Bergmann

Subject: Re: [PATCH] drivers: soc: atmel: fix type for same7

From: Arnd Bergmann <[email protected]>

On Thu, 4 Feb 2021 16:49:25 +0100, Arnd Bergmann wrote:
> A missing comma caused a build failure:
>
> drivers/soc/atmel/soc.c:196:24: error: too few arguments provided to function-like macro invocation

Applied to arm/drivers, thanks!

[1/1] drivers: soc: atmel: fix type for same7
commit: 7deff441f53cc148cbf18381bd252a754b0d7d4e

Arnd