Skip to contentSkip to conversation

drivers: soc: atmel: fix type for same7

PATCH Applied Arnd Bergmann 3 participants 4 messages Feb 4, 2021 – Feb 9, 2021 Arm/Microchip (AT91) SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")

---
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(-)
drivers/soc/atmel/soc.c +1 -1
index a2967846809f..a490ad7e090f 100644
@@ -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,
Signature · 7 lines
2.29.2


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Arnd Bergmann

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")
Quoted 23 lines

---
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(-)
drivers/soc/atmel/soc.c +1 -1
index a2967846809f..a490ad7e090f 100644
@@ -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,
Signature · 1 line
2.29.2
Signature · 8 lines
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
maintainer
#2 lore raw
Quoted 10 lines · Alexandre Belloni
Quoted 8 lines · Arnd Bergmann

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")

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

Quoted 29 lines
Quoted 21 lines

---
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(-)
drivers/soc/atmel/soc.c +1 -2
index a2967846809f..a490ad7e090f 100644
@@ -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,
--
Quoted 2 lines

2.29.2

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

Signature · 6 lines
Nicolas Ferre

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author Applied
#3 lore raw
In reply to Arnd Bergmann

From: Arnd Bergmann <[email protected]>

Quoted 3 lines · Arnd Bergmann

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

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel