From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fabio Estevam Subject: [PATCH v2] serial: mxs-auart: Fix mxs_auart_set_ldisc() Date: Wed, 12 Nov 2014 20:32:49 -0200 Message-ID: <1415831569-6904-1-git-send-email-festevam@gmail.com> Return-path: Received: from mail-qc0-f177.google.com ([209.85.216.177]:56676 "EHLO mail-qc0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753390AbaKLWdj (ORCPT ); Wed, 12 Nov 2014 17:33:39 -0500 Received: by mail-qc0-f177.google.com with SMTP id l6so10196021qcy.36 for ; Wed, 12 Nov 2014 14:33:38 -0800 (PST) Sender: linux-serial-owner@vger.kernel.org List-Id: linux-serial@vger.kernel.org To: gregkh@linuxfoundation.org Cc: j.uzycki@elproma.com.pl, linux-serial@vger.kernel.org, Fabio Estevam From: Fabio Estevam Commit 732a84a037a4 ("serial: core: Pass termios to set_ldisc() notifications") changed the set_ldisc prototype. At the time of this commit the mxs_auart driver did not implement set_ldisc, so that's why it has not been converted. Adapt also mxs_auart_set_ldisc() so that the following build warning can be fixed: drivers/tty/serial/mxs-auart.c:962:2: warning: initialization from incompatible pointer type .set_ldisc = mxs_auart_set_ldisc, ^ drivers/tty/serial/mxs-auart.c:962:2: warning: (near initialization for 'mxs_auart_ops.set_ldisc') Signed-off-by: Fabio Estevam --- Changes since v1: - Fix the explanation for the error Janusz, This is build-tested only. Please test it on real hardware, if possible. drivers/tty/serial/mxs-auart.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c index 3784920..a6d2bb9f4 100644 --- a/drivers/tty/serial/mxs-auart.c +++ b/drivers/tty/serial/mxs-auart.c @@ -784,9 +784,10 @@ static void mxs_auart_settermios(struct uart_port *u, mxs_auart_disable_ms(u); } -static void mxs_auart_set_ldisc(struct uart_port *port, int new) +static void mxs_auart_set_ldisc(struct uart_port *port, + struct ktermios *termios) { - if (new == N_PPS) { + if (termios->c_line == N_PPS) { port->flags |= UPF_HARDPPS_CD; mxs_auart_enable_ms(port); } else { -- 1.9.1