From patchwork Wed Mar 1 12:50:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 94699 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp1778629qgi; Wed, 1 Mar 2017 05:03:23 -0800 (PST) X-Received: by 10.99.160.89 with SMTP id u25mr8676315pgn.92.1488373403181; Wed, 01 Mar 2017 05:03:23 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l2si4547284pga.357.2017.03.01.05.03.23; Wed, 01 Mar 2017 05:03:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750738AbdCANDW (ORCPT + 2 others); Wed, 1 Mar 2017 08:03:22 -0500 Received: from mail-lf0-f46.google.com ([209.85.215.46]:33972 "EHLO mail-lf0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750743AbdCANDV (ORCPT ); Wed, 1 Mar 2017 08:03:21 -0500 Received: by mail-lf0-f46.google.com with SMTP id k202so19069991lfe.1 for ; Wed, 01 Mar 2017 05:01:42 -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=x0WS8fhSjD7tSTpOc2IO9pw4F69cWnYwmB7lDGAsifI=; b=cqzCi4WRQvJEpyVtxkhKoyoZoI6Z3qknGm0pVx1D0JC6QFfGhDJg+vhiitQ8W2rz2c PNycqPcNhe8/HFFkxOp8pZq142Nusi6VoRyzLHyOMX8APpObucwSZAN5b0nK3Fc0NTCj NrHu7Vq0bUaQDzGBX++YUHqvtc7nUQgXNMGdc= 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=x0WS8fhSjD7tSTpOc2IO9pw4F69cWnYwmB7lDGAsifI=; b=e2CbC19hOfAbrLxlG+qZycuJtx/wYgHKetTv+0feb7h54J5r1GovvwyxNtPRtHOObF Vz8xJ8f1SayAZRbD3YKaOMiqgLRwLeWNlG4b8PEhz90P4f+XVCYc8SceTj1rA4vIjYg+ ogoNjhcld3OGlVTchQIRg60WoJXlXaW+hGfTEQgDi0V5DIgbaN/xc+JPk3jjPsj1n3uF 5tVkkDa298hS9ytxMANmF0H9Eb1hHzhjaj49Bp/p6hg+aVnB6f28UeAOKIHeb2IaToxI /voAjECpS+aXVvcGi0KVMsUUTRXY88shaXTM/lYtOKUWofAij5BjBFqwIUGshzoJcMwQ g5CA== X-Gm-Message-State: AMke39lGAM+ebahGnwrroaRSkr4PtIBzZcZJ00PEiePvkTX/OlX/F+7s/xzbIX+uirDFMTUi X-Received: by 10.25.234.71 with SMTP id i68mr2616429lfh.25.1488372854819; Wed, 01 Mar 2017 04:54:14 -0800 (PST) Received: from localhost.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id s14sm1053497ljd.53.2017.03.01.04.54.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Mar 2017 04:54:13 -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 v2] Revert "tty: serial: pl011: add ttyAMA for matching pl011 console" Date: Wed, 1 Mar 2017 15:50:52 +0300 Message-Id: <20170301125053.30480-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-serial-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org The original patch makes condition always true, so it is wrong. This reverts commit aea9a80ba98a0c9b4de88850260e9fbdcc98360b. Signed-off-by: Aleksey Makarov --- v2: add Signed-off-by: drivers/tty/serial/amba-pl011.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.11.1 -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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; }