From: Cong Ding <dinggnu@gmail.com>
To: Mikael Starvik <starvik@axis.com>,
Jesper Nilsson <jesper.nilsson@axis.com>,
linux-cris-kernel@axis.com, linux-kernel@vger.kernel.org
Cc: Cong Ding <dinggnu@gmail.com>
Subject: [PATCH] cris: arch-v32/drivers/sync_serial.c: fix error macro position
Date: Mon, 14 Jan 2013 22:46:28 +0100 [thread overview]
Message-ID: <1358199990-15905-1-git-send-email-dinggnu@gmail.com> (raw)
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
next reply other threads:[~2013-01-14 21:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-14 21:46 Cong Ding [this message]
2013-01-15 9:34 ` [PATCH] cris: arch-v32/drivers/sync_serial.c: fix error macro position Jesper Nilsson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1358199990-15905-1-git-send-email-dinggnu@gmail.com \
--to=dinggnu@gmail.com \
--cc=jesper.nilsson@axis.com \
--cc=linux-cris-kernel@axis.com \
--cc=linux-kernel@vger.kernel.org \
--cc=starvik@axis.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox