From patchwork Wed Dec 5 19:50:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 152957 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp9696086ljp; Wed, 5 Dec 2018 11:52:10 -0800 (PST) X-Google-Smtp-Source: AFSGD/W2Scb4WtS9acsBBTufdkpma1VyeAuaitXqeN4MS0c54wgUFoQuJUpW+W7Gx+o8FuXza8mp X-Received: by 2002:a63:d747:: with SMTP id w7mr21194042pgi.360.1544039530273; Wed, 05 Dec 2018 11:52:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544039530; cv=none; d=google.com; s=arc-20160816; b=kh4Do4c5msAvSuEyWCKSCfDrPUNIBFDZhLocGNiWzmAqF36jeKYFxw+iLrk6wI9ZWg vUEhH7eEBXVY9tBngMvDiRNlXT2cy6pVGbJdpGAQgfwMGVlfxQvLTY/rGm0Eg8ZWlZOh KMJfMWgeGQoJBWvMDSdNQS8b0vd4w5i9rKmgr+ZNFKmoasJ7QHWaHqBAbAfvNsEKtltI u3sYUPR6GIHykfKp/WL6nZtyhMYvoJATg0iFb95i0Dc23dudj7dGc5oOZg39QMSIjTuL 6drR92O4BDpzbzEGaLVbKKzTudhkgCelTNNaJR1M09m2Pot0Is9u1LIpmHUVh63ajUsS r9bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=sl5w3TVJ+wE3vPiBwLh392ShItBJGNo7vWury6PkKf8=; b=XauFysIMeki797H03kqIq1IxqaE6a3vR7amQTZCuapHXqFXqv6kha7fzFtvxo1HwnF im2vG6QbtHYQJ6XTNr/QVISzNo37s9WoThz0YH0/CIO/w03zqSJXJ9dHsRYXBKIL6Cnj jMqes+yuwso1an+7lyeSztY5saFjMsQ1xO5Ib1x9rfjbyUxK/qirMQssVURccQZJxc8d tCPlgE58Q38Djf0E4eIs4Clsj+lLUf66Uhe6zixk0JHWKMG57FJ7PezKnTQYvRvcJZNd 0iLOqEmWvSpJIYbRlXXccspU2O44X6xjgG+ZhCrnN1CPufVQq+K40LiTN/zHrqRv7x2L 24BQ== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j135si18583515pgc.517.2018.12.05.11.52.09; Wed, 05 Dec 2018 11:52:10 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728955AbeLETwI (ORCPT + 31 others); Wed, 5 Dec 2018 14:52:08 -0500 Received: from mail-ot1-f67.google.com ([209.85.210.67]:34694 "EHLO mail-ot1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728832AbeLETvX (ORCPT ); Wed, 5 Dec 2018 14:51:23 -0500 Received: by mail-ot1-f67.google.com with SMTP id t5so19858380otk.1; Wed, 05 Dec 2018 11:51:22 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=sl5w3TVJ+wE3vPiBwLh392ShItBJGNo7vWury6PkKf8=; b=D1fzw/zKBlrzvkMeDBMoteCwB0m7Jg3PZ5+GjDwMpH08VM+YuwgOv3MEyJVfYrzp1H ZF3CD0QDIyF0wd9a8qmMeLfL8XiH4fljqBbhNZhyWiFa6lhOq8Xg1LVdlnZVYIgdQ3Qb /6In07RtrKOGSmOdvYBd8bQcTZdNv9a5dTR1+wynZxXQItAZN51qeM9GYdTAisgZIt9P 0576f0fwE5YE04HFCRFATbsXszlctMvSab3tea0QN5Jl/2yN1j1SuFF9LWd+o/J32tiv 8pvyhOAPTWIJkhjA03g3iCTloVodAgF6M894wGxExJMqWd0izpdm6xDCo5RTWgXpMnb1 k6ug== X-Gm-Message-State: AA+aEWaOjFHgrHWzg53wRkchdgPrfkDyYJHs1SuXg5xELTrUVrViwq6K 4HbzSIawHM2LIAFQn4hHZXxZlG6aFA== X-Received: by 2002:a9d:4201:: with SMTP id q1mr14968194ote.126.1544039481659; Wed, 05 Dec 2018 11:51:21 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id k13sm25759879otj.19.2018.12.05.11.51.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Dec 2018 11:51:21 -0800 (PST) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Greg Kroah-Hartman , Jiri Slaby , "David S. Miller" , linuxppc-dev@lists.ozlabs.org, linux-serial@vger.kernel.org, sparclinux@vger.kernel.org Subject: [PATCH] tty: Use of_node_name_{eq, prefix} for node name comparisons Date: Wed, 5 Dec 2018 13:50:43 -0600 Message-Id: <20181205195050.4759-27-robh@kernel.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert string compares of DT node names to use of_node_name_eq helper instead. This removes direct access to the node name pointer. For hvc, the code can also be simplified by using of_stdout pointer instead of searching again for the stdout node. Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Michael Ellerman Cc: Greg Kroah-Hartman Cc: Jiri Slaby Cc: "David S. Miller" Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-serial@vger.kernel.org Cc: sparclinux@vger.kernel.org Signed-off-by: Rob Herring --- drivers/tty/hvc/hvc_opal.c | 2 +- drivers/tty/hvc/hvc_vio.c | 11 +---------- drivers/tty/serial/pmac_zilog.c | 4 ++-- drivers/tty/serial/suncore.c | 8 ++++---- drivers/tty/serial/sunsu.c | 4 ++-- 5 files changed, 10 insertions(+), 19 deletions(-) -- 2.19.1 diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c index 77baf895108f..c66412566efc 100644 --- a/drivers/tty/hvc/hvc_opal.c +++ b/drivers/tty/hvc/hvc_opal.c @@ -353,7 +353,7 @@ void __init hvc_opal_init_early(void) if (!opal) return; for_each_child_of_node(opal, np) { - if (!strcmp(np->name, "serial")) { + if (of_node_name_eq(np, "serial")) { stdout_node = np; break; } diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c index 59eaa620bf13..6de6d4a1a221 100644 --- a/drivers/tty/hvc/hvc_vio.c +++ b/drivers/tty/hvc/hvc_vio.c @@ -371,20 +371,11 @@ device_initcall(hvc_vio_init); /* after drivers/tty/hvc/hvc_console.c */ void __init hvc_vio_init_early(void) { const __be32 *termno; - const char *name; const struct hv_ops *ops; /* find the boot console from /chosen/stdout */ - if (!of_stdout) - return; - name = of_get_property(of_stdout, "name", NULL); - if (!name) { - printk(KERN_WARNING "stdout node missing 'name' property!\n"); - return; - } - /* Check if it's a virtual terminal */ - if (strncmp(name, "vty", 3) != 0) + if (!of_node_name_prefix(of_stdout, "vty")) return; termno = of_get_property(of_stdout, "reg", NULL); if (termno == NULL) diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c index a9d40988e1c8..bcb5bf70534e 100644 --- a/drivers/tty/serial/pmac_zilog.c +++ b/drivers/tty/serial/pmac_zilog.c @@ -1648,9 +1648,9 @@ static int __init pmz_probe(void) */ node_a = node_b = NULL; for (np = NULL; (np = of_get_next_child(node_p, np)) != NULL;) { - if (strncmp(np->name, "ch-a", 4) == 0) + if (of_node_name_prefix(np, "ch-a")) node_a = of_node_get(np); - else if (strncmp(np->name, "ch-b", 4) == 0) + else if (of_node_name_prefix(np, "ch-b")) node_b = of_node_get(np); } if (!node_a && !node_b) { diff --git a/drivers/tty/serial/suncore.c b/drivers/tty/serial/suncore.c index 70a4ea4eaa6e..661e8b151366 100644 --- a/drivers/tty/serial/suncore.c +++ b/drivers/tty/serial/suncore.c @@ -89,14 +89,14 @@ void sunserial_console_termios(struct console *con, struct device_node *uart_dp) int baud, bits, stop, cflag; char parity; - if (!strcmp(uart_dp->name, "rsc") || - !strcmp(uart_dp->name, "rsc-console") || - !strcmp(uart_dp->name, "rsc-control")) { + if (of_node_name_eq(uart_dp, "rsc") || + of_node_name_eq(uart_dp, "rsc-console") || + of_node_name_eq(uart_dp, "rsc-control")) { mode = of_get_property(uart_dp, "ssp-console-modes", NULL); if (!mode) mode = "115200,8,n,1,-"; - } else if (!strcmp(uart_dp->name, "lom-console")) { + } else if (of_node_name_eq(uart_dp, "lom-console")) { mode = "9600,8,n,1,-"; } else { struct device_node *dp; diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c index 6cf3e9b0728f..8ed60ccd45fb 100644 --- a/drivers/tty/serial/sunsu.c +++ b/drivers/tty/serial/sunsu.c @@ -1482,8 +1482,8 @@ static int su_probe(struct platform_device *op) up->port.ops = &sunsu_pops; ignore_line = false; - if (!strcmp(dp->name, "rsc-console") || - !strcmp(dp->name, "lom-console")) + if (of_node_name_eq(dp, "rsc-console") || + of_node_name_eq(dp, "lom-console")) ignore_line = true; sunserial_console_match(SUNSU_CONSOLE(), dp,