Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751571AbdCANFr (ORCPT ); Wed, 1 Mar 2017 08:05:47 -0500 Received: from mail-lf0-f52.google.com ([209.85.215.52]:36600 "EHLO mail-lf0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751102AbdCANFn (ORCPT ); Wed, 1 Mar 2017 08:05:43 -0500 Subject: Re: [PATCH] Revert "tty: serial: pl011: add ttyAMA for matching pl011 console" To: Robin Murphy , linux-serial@vger.kernel.org References: <20170301122602.30025-1-aleksey.makarov@linaro.org> Cc: Peter Hurley , Greg Kroah-Hartman , Jiri Slaby , linux-kernel@vger.kernel.org, Russell King , Sudeep Holla , linux-arm-kernel@lists.infradead.org From: Aleksey Makarov Message-ID: Date: Wed, 1 Mar 2017 16:01:33 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1504 Lines: 46 On 03/01/2017 03:59 PM, Robin Murphy wrote: > On 01/03/17 12:26, Aleksey Makarov wrote: >> The original patch makes condition always true, so it is wrong. >> >> This reverts commit aea9a80ba98a0c9b4de88850260e9fbdcc98360b. > > It seems fairly clear that the intent of the code merely warrants > s/||/&&/ - wouldn't it be more straightforward to just fix that? No, I don't think so. The description of the patch says that it fixes a problem of double printing the logs with SPCR and both console=ttyAMA and earlycon are specified on the command string. That wrong patch does "fix" it, but introduces a regression with the regular case. With s/||/&&/ it would not even 'fix' the described problem. Thank you Aleksey Makarov > Robin. > >> --- >> drivers/tty/serial/amba-pl011.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c >> index 8789ea423ccf..56f92d7348bf 100644 >> --- a/drivers/tty/serial/amba-pl011.c >> +++ b/drivers/tty/serial/amba-pl011.c >> @@ -2373,7 +2373,7 @@ static int __init pl011_console_match(struct console *co, char *name, int idx, >> if (strcmp(name, "qdf2400_e44") == 0) { >> pr_info_once("UART: Working around QDF2400 SoC erratum 44"); >> qdf2400_e44_present = true; >> - } else if (strcmp(name, "pl011") != 0 || strcmp(name, "ttyAMA") != 0) { >> + } else if (strcmp(name, "pl011") != 0) { >> return -ENODEV; >> } >> >> > -- All the best Alekséy Makárov