* [PATCH] cris: arch-v32/drivers/sync_serial.c: fix error macro position
@ 2013-01-14 21:46 Cong Ding
2013-01-15 9:34 ` Jesper Nilsson
0 siblings, 1 reply; 2+ messages in thread
From: Cong Ding @ 2013-01-14 21:46 UTC (permalink / raw)
To: Mikael Starvik, Jesper Nilsson, linux-cris-kernel, linux-kernel; +Cc: Cong Ding
the macro CONFIG_ETRAXFS is used in wrong position - all the port[1] related
stuff should be used only when CONFIG_ETRAXFS is enabled.
Signed-off-by: Cong Ding <dinggnu@gmail.com>
---
arch/cris/arch-v32/drivers/sync_serial.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/cris/arch-v32/drivers/sync_serial.c b/arch/cris/arch-v32/drivers/sync_serial.c
index a6a180b..f600cd3 100644
--- a/arch/cris/arch-v32/drivers/sync_serial.c
+++ b/arch/cris/arch-v32/drivers/sync_serial.c
@@ -276,6 +276,7 @@ static int __init etrax_sync_serial_init(void)
initialize_port(0);
#endif
+#ifdef CONFIG_ETRAXFS
#if defined(CONFIG_ETRAX_SYNCHRONOUS_SERIAL_PORT1)
if (crisv32_pinmux_alloc_fixed(pinmux_sser1)) {
printk(KERN_WARNING
@@ -285,12 +286,10 @@ static int __init etrax_sync_serial_init(void)
ports[1].enabled = 1;
initialize_port(1);
#endif
-
-#ifdef CONFIG_ETRAXFS
printk(KERN_INFO "ETRAX FS synchronous serial port driver\n");
-#else
+#else /* CONFIG_ETRAXFS */
printk(KERN_INFO "Artpec-3 synchronous serial port driver\n");
-#endif
+#endif /* CONFIG_ETRAXFS */
return 0;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] cris: arch-v32/drivers/sync_serial.c: fix error macro position
2013-01-14 21:46 [PATCH] cris: arch-v32/drivers/sync_serial.c: fix error macro position Cong Ding
@ 2013-01-15 9:34 ` Jesper Nilsson
0 siblings, 0 replies; 2+ messages in thread
From: Jesper Nilsson @ 2013-01-15 9:34 UTC (permalink / raw)
To: Cong Ding; +Cc: Mikael Starvik, linux-cris-kernel, linux-kernel
On Mon, Jan 14, 2013 at 10:46:28PM +0100, Cong Ding wrote:
> the macro CONFIG_ETRAXFS is used in wrong position - all the port[1] related
> stuff should be used only when CONFIG_ETRAXFS is enabled.
Problem should not be possible to see unless you enable
CONFIG_ETRAX_SYNCHRONOUS_SERIAL_PORT1 also, which has
depends on ETRAX_SYNCHRONOUS_SERIAL && ETRAXFS
in the Kconfig...
> Signed-off-by: Cong Ding <dinggnu@gmail.com>
...But anyways, the hardware doesn't have the second synchronous serial port
for ARTPEC-3, so for clarity I'll take this in the CRIS tree. My thanks.
/^JN - Jesper Nilsson
--
Jesper Nilsson -- jesper.nilsson@axis.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-01-15 9:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-14 21:46 [PATCH] cris: arch-v32/drivers/sync_serial.c: fix error macro position Cong Ding
2013-01-15 9:34 ` Jesper Nilsson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox