From patchwork Wed Mar 1 12:26:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 94698 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp1769053qgi; Wed, 1 Mar 2017 04:40:11 -0800 (PST) X-Received: by 10.99.94.198 with SMTP id s189mr8543861pgb.211.1488372011643; Wed, 01 Mar 2017 04:40:11 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k7si4535214pln.183.2017.03.01.04.40.11; Wed, 01 Mar 2017 04:40:11 -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 S1751665AbdCAMkC (ORCPT + 25 others); Wed, 1 Mar 2017 07:40:02 -0500 Received: from mail-lf0-f45.google.com ([209.85.215.45]:35678 "EHLO mail-lf0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750778AbdCAMj5 (ORCPT ); Wed, 1 Mar 2017 07:39:57 -0500 Received: by mail-lf0-f45.google.com with SMTP id z127so18841555lfa.2 for ; Wed, 01 Mar 2017 04:39:10 -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; bh=Ggx175k13JMt59h5i0lBemWz57/4qDzjNUT4Y6vr0HE=; b=fX74zn5SYNsd1tz4XSZ1oN9c+WksJ50swmKzZ3sE6zNzgwQ3mgirjMPWr42TTjanC4 PDpvKOhDr3jxeHuG4GVQ7uovztkkfnroJhN3qICM1/tUyQyVW1RKI7cvgTCot39TjwQE zxn+BEr+ilO9Fru/z3V/PSeuQRlJXc03PMUVg= 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; bh=Ggx175k13JMt59h5i0lBemWz57/4qDzjNUT4Y6vr0HE=; b=aAqUMA9TuP42IgSGTriHXkjUEoUO0lquY/C6MQL0dfDYyPur7ISetLOuxaLghi9a1I CwUTmlC0mhtch3Q1ATnga3T8kfC6X/d6Dr+4P+WySTdeP+Qd3CJ6jW67FB3mLMxpBl8W dc6WF825vnzVYI0KvJFg6RjsyEkSgYfErTZgExdrotcMMhDz6jqGzsndjQ9BFsjPytub oEMYrosWGMqnDpNCg/uUBwtw+igBS4v2NuJsRTYn2T1j36W64BJWF5q6Ozc4NNRS/Rkj rGOGQZHmM0gCgDMXpunRd9p0147JsGXbm+p/80ciKUBpKx8xMs5lkWILDKPiZnsIBDJ8 U55Q== X-Gm-Message-State: AMke39mR3mADs3BNlKw/5GgNCYcLqesIRNEOALkeHSeo0eAJ/RwCUCBGLCuk8sXDhJYZ1dI5 X-Received: by 10.25.25.147 with SMTP id 141mr2654927lfz.87.1488371388064; Wed, 01 Mar 2017 04:29:48 -0800 (PST) Received: from localhost.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id 79sm1055487ljj.45.2017.03.01.04.29.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Mar 2017 04:29:47 -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 Subject: [PATCH] Revert "tty: serial: pl011: add ttyAMA for matching pl011 console" Date: Wed, 1 Mar 2017 15:26:01 +0300 Message-Id: <20170301122602.30025-1-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.11.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The original patch makes condition always true, so it is wrong. This reverts commit aea9a80ba98a0c9b4de88850260e9fbdcc98360b. --- 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; }