Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751808AbdCANJQ (ORCPT ); Wed, 1 Mar 2017 08:09:16 -0500 Received: from foss.arm.com ([217.140.101.70]:48372 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751123AbdCANJP (ORCPT ); Wed, 1 Mar 2017 08:09:15 -0500 Subject: Re: [PATCH] Revert "tty: serial: pl011: add ttyAMA for matching pl011 console" References: <20170301122602.30025-1-aleksey.makarov@linaro.org> To: Aleksey Makarov , linux-serial@vger.kernel.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: Robin Murphy Message-ID: Date: Wed, 1 Mar 2017 12:59:41 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <20170301122602.30025-1-aleksey.makarov@linaro.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1020 Lines: 28 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? 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; > } > >