mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
To: One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>,
	Alan Cox <alan@linux.intel.com>,
	linux-serial@vger.kernel.org
Cc: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jiri Slaby <jslaby@suse.cz>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 05/12] 8250/fintek: Use rs485 handler from serial_core
Date: Wed,  8 Oct 2014 21:57:31 +0200	[thread overview]
Message-ID: <1412798258-23655-6-git-send-email-ricardo.ribalda@gmail.com> (raw)
In-Reply-To: <1412798258-23655-1-git-send-email-ricardo.ribalda@gmail.com>

In order to remove the handler for rs485 ioctls on serial_8250, all the
drivers must use the implementation on serial_core.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: linux-serial@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
 drivers/tty/serial/8250/8250_fintek.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_fintek.c b/drivers/tty/serial/8250/8250_fintek.c
index 1bb28cb..1e6899bc 100644
--- a/drivers/tty/serial/8250/8250_fintek.c
+++ b/drivers/tty/serial/8250/8250_fintek.c
@@ -89,11 +89,11 @@ static int fintek_8250_check_id(void)
 	return 0;
 }
 
-static int fintek_8250_rs4850_config(struct uart_8250_port *uart,
+static int fintek_8250_rs485_config(struct uart_port *port,
 			      struct serial_rs485 *rs485)
 {
 	uint8_t config = 0;
-	int index = fintek_8250_get_index(uart->port.iobase);
+	int index = fintek_8250_get_index(port->iobase);
 
 	if (index < 0)
 		return -EINVAL;
@@ -134,6 +134,8 @@ static int fintek_8250_rs4850_config(struct uart_8250_port *uart,
 	outb(config, DATA_PORT);
 	fintek_8250_exit_key();
 
+	port->rs485 = *rs485;
+
 	return 0;
 }
 
@@ -166,7 +168,7 @@ fintek_8250_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
 	uart.port.irq = pnp_irq(dev, 0);
 	uart.port.iobase = pnp_port_start(dev, 0);
 	uart.port.iotype = UPIO_PORT;
-	uart.rs485_config = fintek_8250_rs4850_config;
+	uart.port.rs485_config = fintek_8250_rs485_config;
 
 	uart.port.flags |= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;
 	if (pnp_irq_flags(dev, 0) & IORESOURCE_IRQ_SHAREABLE)
-- 
2.1.1


  parent reply	other threads:[~2014-10-08 20:01 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1412798258-23655-1-git-send-email-ricardo.ribalda@gmail.com>
2014-10-08 19:57 ` [PATCH 01/12] serial/max310x: Remove obsolete #ifset TIOC[SG]RS485 Ricardo Ribalda Delgado
2014-10-08 19:57 ` [PATCH 02/12] serial/sc16is7xx: " Ricardo Ribalda Delgado
2014-10-08 19:57 ` [PATCH 03/12] serial_core: Handle TIOC[GS]RS485 ioctls Ricardo Ribalda Delgado
2014-10-08 20:11   ` Alan Cox
2014-10-08 20:43     ` Ricardo Ribalda Delgado
2014-10-08 23:29       ` Alan Cox
2014-10-09  8:07     ` Ricardo Ribalda Delgado
2014-10-09 14:16       ` Alan Cox
2014-11-05 19:37         ` Ricardo Ribalda Delgado
2014-10-08 19:57 ` [PATCH 04/12] serial/8250: Copy RS485 fields to serial_core Ricardo Ribalda Delgado
2014-10-08 19:57 ` Ricardo Ribalda Delgado [this message]
2014-10-08 19:57 ` [PATCH 06/12] serial/8250: Remove obsolete handling of rs485 ioctls Ricardo Ribalda Delgado
2014-10-08 19:57 ` [PATCH 07/12] serial/sc16is7xx: Use the rs485 functions on serial_core Ricardo Ribalda Delgado
2014-10-08 19:57 ` [PATCH 08/12] serial/mcf: " Ricardo Ribalda Delgado
2014-10-08 19:57 ` [PATCH 09/12] serial/atmel: " Ricardo Ribalda Delgado
2014-10-08 19:57 ` [PATCH 10/12] serial/omap: " Ricardo Ribalda Delgado
2014-10-08 19:57 ` [PATCH 11/12] drivers/max310: " Ricardo Ribalda Delgado
2014-10-08 19:57 ` [PATCH 12/12] serial_core: Remove call to driver-specific TIO[GS]RS485] Ricardo Ribalda Delgado

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=1412798258-23655-6-git-send-email-ricardo.ribalda@gmail.com \
    --to=ricardo.ribalda@gmail.com \
    --cc=alan@linux.intel.com \
    --cc=gnomes@lxorguk.ukuu.org.uk \
    --cc=gregkh@linuxfoundation.org \
    --cc=jslaby@suse.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    /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

all inboxes | Powered by JetHome®