From patchwork Wed Mar 1 15:23:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 94711 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp1848401qgi; Wed, 1 Mar 2017 07:26:39 -0800 (PST) X-Received: by 10.99.101.197 with SMTP id z188mr3297776pgb.164.1488381999656; Wed, 01 Mar 2017 07:26:39 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b4si4856328pli.298.2017.03.01.07.26.39; Wed, 01 Mar 2017 07:26:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752093AbdCAP0h (ORCPT + 25 others); Wed, 1 Mar 2017 10:26:37 -0500 Received: from mail-lf0-f43.google.com ([209.85.215.43]:35384 "EHLO mail-lf0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751599AbdCAP0c (ORCPT ); Wed, 1 Mar 2017 10:26:32 -0500 Received: by mail-lf0-f43.google.com with SMTP id z127so21070072lfa.2 for ; Wed, 01 Mar 2017 07:26:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ppzAZswpVNAKeaql3aBfTg5zLm1NX4dBsw+ajsAdGHk=; b=ZuB088/uowNk3oQCnHRbZ7R5yJJLcwYnTyXl3Vmdx0PFkc5g45O2L3cLwt6hXCEHVQ DQZkWBD3OqrWnBQfxrbUXu5/D/00JgxQYRN6S3TkD1tHigPhMi9GGWfvWAgN01d0XVN0 VpmbE43uwjW6iCJKBY4CUlRKQ2HfCTa9QvJ7w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ppzAZswpVNAKeaql3aBfTg5zLm1NX4dBsw+ajsAdGHk=; b=azSCPOi6K5BRa9oBeyq7Ic0NRiO0Jhq3XZLDqwmEHw3eVZkOEdmfe9gvuY+nBS29gH GYzDLvKu0gbsl+KJQ0lWlNWB5KrE9/c9EydJVljyAIpEvK6oUnEVFJgP0D0L10NKOBbb PKrmJ2D1fcG93M6jnGE36i4JKhdCg2LePXHiDZD1GSYXuDA9Xi9kwWnzuwbcKMh9D7Gk AIx2Gb5RYOCid8r5GM1NeBEHYBXu1dOuJ9w3Kv/NQEHmvxMWTLzGeakPDCBhVKxIZbIt paab03vHxk1/e931dpBUBwRSM9ZLPCitiPTp4YQugSHTT1wariOnCLKM2xmY56gCL02e FV8A== X-Gm-Message-State: AMke39lexTQyREFhxTZJ4bgBbFilAX5M1Tj6qV5J4tU5Q/89Oj5Lc45LjAHjS6HfETyMA04o X-Received: by 10.25.228.66 with SMTP id b63mr2991354lfh.177.1488381987527; Wed, 01 Mar 2017 07:26:27 -0800 (PST) Received: from localhost.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id 25sm1112486lju.56.2017.03.01.07.26.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Mar 2017 07:26:26 -0800 (PST) From: Aleksey Makarov To: linux-serial@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Aleksey Makarov , Sudeep Holla , Greg Kroah-Hartman , Peter Hurley , Russell King , Jiri Slaby , Robin Murphy Subject: [PATCH v3] Revert "tty: serial: pl011: add ttyAMA for matching pl011 console" Date: Wed, 1 Mar 2017 18:23:02 +0300 Message-Id: <20170301152304.29635-1-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170301122602.30025-1-aleksey.makarov@linaro.org> References: <20170301122602.30025-1-aleksey.makarov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The original patch makes the condition always true, so it is wrong. It masks (but not fixes) the bug described in the commit message but introduces a regression (no console is selected by SPCR) in regular (no 'console=ttyAMA') case. s/||/&&/ would not fix the problem as the root cause was identified incorrectly. This reverts commit aea9a80ba98a0c9b4de88850260e9fbdcc98360b. Signed-off-by: Aleksey Makarov --- v3: fix commit message (Robin Murphy) v2: add Signed-off-by: drivers/tty/serial/amba-pl011.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.11.1 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; }