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: 9598363 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E1BA4600CB for ; Wed, 1 Mar 2017 12:54:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB137284CB for ; Wed, 1 Mar 2017 12:54:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CFC9A2853C; Wed, 1 Mar 2017 12:54:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D77A2284CB for ; Wed, 1 Mar 2017 12:54:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=t7j+XM4tV7PoLjbfrBjsy1VYUMgnr/tLh5Zk2VPhvy4=; b=OAJry0CRbiGEqvE8x8gf4EnQdI FQElPs24u3ElpOE2Dqp5BwyFJNwU1NtituEQ+kCFm3lMWPf29rNEmiws4q3O6QtNi/DMI5EifxdAT qHHbxaQbuVRsM7QGR6N3EqVQOc2EjMBZKBp7k7i33oPxv1k8m5+u6At+uVtkSGbZh6KyOzryxvKLu /xlY1J26Gar/+lxMO5E2Jboh2waXaOE8GgdladrLvYHmUQlZJJFftJokjaFL8P3CXNCLklyjMIoS0 QbdYrpEaK7uihv2wPaR1N/dJozjc+/W1lLJUd50X0BrmEOhui6gHVald34t+LUNI6xDuMLXbPJ+Zk Wt3B06RA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cj3mD-00024D-9R; Wed, 01 Mar 2017 12:54:41 +0000 Received: from mail-lf0-x230.google.com ([2a00:1450:4010:c07::230]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cj3m9-000223-6g for linux-arm-kernel@lists.infradead.org; Wed, 01 Mar 2017 12:54:39 +0000 Received: by mail-lf0-x230.google.com with SMTP id a6so18979500lfa.0 for ; Wed, 01 Mar 2017 04:54:16 -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=TgO3mD2TMJLlkJwT8pIA1uWj1PJ1aa5FuFO60OR9YbXbl13EswKKNQEYKVrDO3rKf9 Mtb7rE1S2b5aIakVx3FDNYzop5lgnNnUaCwl1/D0vn6YAyk7DvziNgpEPYOvgpqEDJKn V6z9SYUgKnVEUowJae1asK1533eLWc01Xbf0yZamRgVVxWMojdaod48MsLo4+r4n+B2C uSgJxvQQ8SHXbbu7YqYBtMHjX5KTd20mcKqvdnn3LvxYhXSZYLrr0JUFyQiF2niGl2IB qemGmucdn6a1JoKOHxsobEqcUxYMK//6rx3CtJ+zOj2aLwyfuzS1uEsXHMJ9rK0WMYkG O51g== X-Gm-Message-State: AMke39nOfy3os/SfV7dAJFca7WrxwmEF9z0S0D96Kd67yqADIXYM5M41YC0/g4OwzCZWgCOf 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170301_045437_439433_72627E66 X-CRM114-Status: GOOD ( 11.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Hurley , Greg Kroah-Hartman , Jiri Slaby , linux-kernel@vger.kernel.org, Russell King , Aleksey Makarov , Sudeep Holla , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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; }