From: Claudio Scordino <claudio@evidence.eu.com>
To: starvik@axis.com, Jesper Nilsson <Jesper.Nilsson@axis.com>
Cc: linux-cris-kernel <linux-cris-kernel@axis.com>,
"linux-serial@vger.kernel.org" <linux-serial@vger.kernel.org>,
Linux Kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH] RS485 on Cris: use global value of TIOCSRS485
Date: Thu, 06 Jan 2011 09:25:43 +0100 [thread overview]
Message-ID: <4D257C87.4040400@evidence.eu.com> (raw)
Hi Jesper, Hi Mikael,
the following patch sets the value of TIOCSRS485 on Cris
equal to the value of all other architectures (as currently is for
TIOCGRS485).
With this patch, TIOCSRS485 gets the same value across all
architectures, making maintenance and portability of user-level code
easier.
Best regards,
Claudio
RS485: use global value of TIOCSRS485 (i.e. 0x546F) on Cris.
Signed-off-by: Claudio Scordino <claudio@evidence.eu.com>
---
arch/cris/include/asm/ioctls.h | 2 +-
drivers/serial/crisv10.c | 5 +++++
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/arch/cris/include/asm/ioctls.h b/arch/cris/include/asm/ioctls.h
index 488fbb3..2c15ff8 100644
--- a/arch/cris/include/asm/ioctls.h
+++ b/arch/cris/include/asm/ioctls.h
@@ -4,7 +4,7 @@
#define TIOCSERGSTRUCT 0x5458 /* For debugging only */
#define TIOCSERSETRS485 0x5461 /* enable rs-485 (deprecated) */
#define TIOCSERWRRS485 0x5462 /* write rs-485 */
-#define TIOCSRS485 0x5463 /* enable rs-485 */
+#define TIOCSRS485DEPR 0x5463 /* enable rs-485 (deprecated) */
#include <asm-generic/ioctls.h>
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index bcc31f2..29bd418 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -3717,6 +3717,11 @@ rs_ioctl(struct tty_struct *tty, struct file * file,
return e100_enable_rs485(tty, &rs485data);
}
+ case TIOCSRS485DEPR:
+ {
+ printk(KERN_DEBUG "The use of this ioctl is deprecated. Use TIOCSRS485 instead\n");
+ /* Fall through */
+ }
case TIOCSRS485:
{
/* This is the new version of TIOCSRS485, with new
--
1.7.1
next reply other threads:[~2011-01-06 8:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-06 8:25 Claudio Scordino [this message]
2011-01-06 13:34 ` [PATCH] RS485 on Cris: use global value of TIOCSRS485 Alan Cox
2011-01-06 16:58 ` Claudio Scordino
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=4D257C87.4040400@evidence.eu.com \
--to=claudio@evidence.eu.com \
--cc=Jesper.Nilsson@axis.com \
--cc=linux-cris-kernel@axis.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@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;
as well as URLs for NNTP newsgroup(s).