From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755298AbdBGNFN (ORCPT ); Tue, 7 Feb 2017 08:05:13 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:63785 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755090AbdBGNCi (ORCPT ); Tue, 7 Feb 2017 08:02:38 -0500 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: Arnd Bergmann , Jiri Slaby , Geert Uytterhoeven , Laurent Pinchart , Peter Hurley , Simon Horman , Ulrich Hecht , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] serial: sh-sci: Temporarily Revert "implement FIFO threshold register setting" Date: Tue, 7 Feb 2017 14:00:54 +0100 Message-Id: <20170207130109.502274-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:dnHnBQPGL+3LPQDkLxcRav+SEx/mHFLgJLldKFBdalK9HBGglEB floQwVTFRquwleWztqmKjoWKjyA8De3qKP4gsKSu1yntzfXAHmTdn9DzXtbAKhTCdfoQwcm ZCmEVvbpyWZdS8xSRllwP03krufqbUmitMlH4JMBvJejvhpeMDMPx6MIpL+JO5YB1Eackny CP1sCgzCwrVm3XGRBl16w== X-UI-Out-Filterresults: notjunk:1;V01:K0:2RuFtWFdi6k=:FkeAtPhaAguHZNIHAYcjq/ +0OaFpKHb1W16C38RiQBab8Cz1q1ajDAJaxzU+dzUQn/zMGPCL6MWbuK2CaaFj0fImpHwOJTM lcGTcB1WUgdm5PGnkQlmPbw8kBHn+zROq82OfbJC2DMNA5zCwahZH6Nqqqu6PYsAKF71SzMqb NZFC1ASC8yO6F/LY3eBU7x7RyNlkc1Qh9kl8vxStF3bJ5gkHAGn+wMBlm/W+Az6546X3xPr0+ C7zh/T355YA01ALNbS/0dHX0ZCQsseXa/0VEny9faKKvhXK5hAeskLQTDxdDtk++dAVGqyCt3 3RHXDMgnRUTx697jTQ6jkJ67POuuK4WOacUXpZ/vHB8Tp4qCZGJDUroqy5BPwdML/Og/SYnZQ G0SBC8Btq533axHxNfEgpppVQy3ZTCVY9YSK9N4Oi1b5+cSUXidS7c3oEbnBU9sybgjeLO8a1 0DKN6QKG/evv9NEUBVQxHQrfoXtgncTWv2wrPrGdjZcvZjxVpb+53zzX2pA/oVuAqgKprelt8 EXLzJovC6a55hUZkSuQ1wRhyzx0mIAim571zE3JRVo49T78ytAy+2saiPSI8Xlz7W158tbh5j 8uggRIuSgyKpNOmI4cPM7AlkNkWp3f3uMRg6ZXOwMtvNAZI624J8UwFZOTN27Yv2NKVWKQU3k fohaJt4Pp6BC7BZcc1zOTydxZ5p6kAOoOefFYugJfSfQggWhjELdWHxJtjUDx0W/HppI= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Patch the first three patches out of seven were applied, up to commit a380ed461f66 ("serial: sh-sci: implement FIFO threshold register setting"), which introduces a new helper function. This is not called until the next following patch, so we now get a build warning: drivers/tty/serial/sh-sci.c:977:12: error: 'scif_set_rtrg' defined but not used [-Werror=unused-function] The patch is good, but I think we should either apply the following patches as well, or revert this one to get a clean build. Signed-off-by: Arnd Bergmann --- This is mainly a notification that I've applied the revert to my randconfig test tree, if you plan to merge the following patches for 4.11, we won't need this one. --- drivers/tty/serial/sh-sci.c | 59 --------------------------------------------- 1 file changed, 59 deletions(-) diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 050d028cf2a1..5044a5e5d340 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -974,65 +974,6 @@ static int sci_handle_breaks(struct uart_port *port) return copied; } -static int scif_set_rtrg(struct uart_port *port, int rx_trig) -{ - unsigned int bits; - - if (rx_trig < 1) - rx_trig = 1; - if (rx_trig >= port->fifosize) - rx_trig = port->fifosize; - - /* HSCIF can be set to an arbitrary level. */ - if (sci_getreg(port, HSRTRGR)->size) { - serial_port_out(port, HSRTRGR, rx_trig); - return rx_trig; - } - - switch (port->type) { - case PORT_SCIF: - if (rx_trig < 4) { - bits = 0; - rx_trig = 1; - } else if (rx_trig < 8) { - bits = SCFCR_RTRG0; - rx_trig = 4; - } else if (rx_trig < 14) { - bits = SCFCR_RTRG1; - rx_trig = 8; - } else { - bits = SCFCR_RTRG0 | SCFCR_RTRG1; - rx_trig = 14; - } - break; - case PORT_SCIFA: - case PORT_SCIFB: - if (rx_trig < 16) { - bits = 0; - rx_trig = 1; - } else if (rx_trig < 32) { - bits = SCFCR_RTRG0; - rx_trig = 16; - } else if (rx_trig < 48) { - bits = SCFCR_RTRG1; - rx_trig = 32; - } else { - bits = SCFCR_RTRG0 | SCFCR_RTRG1; - rx_trig = 48; - } - break; - default: - WARN(1, "unknown FIFO configuration"); - return 1; - } - - serial_port_out(port, SCFCR, - (serial_port_in(port, SCFCR) & - ~(SCFCR_RTRG1 | SCFCR_RTRG0)) | bits); - - return rx_trig; -} - #ifdef CONFIG_SERIAL_SH_SCI_DMA static void sci_dma_tx_complete(void *arg) { -- 2.9.0