From patchwork Wed Dec 5 19:50:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 1008436 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4398pb59tFz9s3l for ; Thu, 6 Dec 2018 07:04:55 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=kernel.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4398pb3kj9zDqdn for ; Thu, 6 Dec 2018 07:04:55 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=fail (p=none dis=none) header.from=kernel.org X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=209.85.167.195; helo=mail-oi1-f195.google.com; envelope-from=robherring2@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=fail (p=none dis=none) header.from=kernel.org Received: from mail-oi1-f195.google.com (mail-oi1-f195.google.com [209.85.167.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4398Vn1dp2zDqSv for ; Thu, 6 Dec 2018 06:51:13 +1100 (AEDT) Received: by mail-oi1-f195.google.com with SMTP id j21so18612737oii.8 for ; Wed, 05 Dec 2018 11:51:13 -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=9ctNxvuyPF5iqgO7AZYmXgEh7unI6vGdlJZ+SjG9Pu4=; b=ZmsA9fIHHZFx8P4k+0Q/6Hie503txhC+uKTOxiDCGQdw4TtcL5DDodNV4AbS68G66z yrsH0ucT1SH9yRX4m6Z/AGI1gBXhcuqknOuYvXnI3I1QmEis3Q1Dfc7WX6q2xXO01OQu 0dEry2mB3Bxtd0iFNBhMBSiSUs9bnnwIbw4QjaPFGKqIDZ9+awnOJ+jzVs3sVIbBM+mb T8NX7Kv1k0CcpmB4xDknxLJiiPqbjeA9Wc/527zCCBaiBHBJ4Y/aCKE8ISqOooZcbgwZ 3HNGkNXSBi5l39/GmFpMZYgDv6bQkUJAtXp3xHq/pjqI6h8rJCu3qemLaF/b5/NSBX2i MnIg== X-Gm-Message-State: AA+aEWZ1Ie6H5QYOdbmcSd+rdMTYorZmU5d99L0q7xVto5U7oBryAvWy quEHVIgumalBhQfLZ05Y4Q== X-Google-Smtp-Source: AFSGD/UQFuqODoTBBhlJKDYvPvLymfufJzQnVu/VHssTq1BrKjuv7zqncceA/oBeLnr1nJBE1jjr2g== X-Received: by 2002:a54:4f1d:: with SMTP id e29mr15009889oiy.310.1544039471399; Wed, 05 Dec 2018 11:51:11 -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.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Dec 2018 11:51:10 -0800 (PST) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] PCI: Use of_node_name_eq for node name comparisons Date: Wed, 5 Dec 2018 13:50:34 -0600 Message-Id: <20181205195050.4759-18-robh@kernel.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Mackerras , linux-pci@vger.kernel.org, Bjorn Helgaas , linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Convert string compares of DT node names to use of_node_name_eq helper instead. This removes direct access to the node name pointer. Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Michael Ellerman Cc: Bjorn Helgaas Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-pci@vger.kernel.org Signed-off-by: Rob Herring --- drivers/pci/hotplug/rpaphp_core.c | 2 +- drivers/pci/of.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c index bcd5d357ca23..7697d9c92b98 100644 --- a/drivers/pci/hotplug/rpaphp_core.c +++ b/drivers/pci/hotplug/rpaphp_core.c @@ -354,7 +354,7 @@ int rpaphp_add_slot(struct device_node *dn) const int *indexes, *names, *types, *power_domains; char *name, *type; - if (!dn->name || strcmp(dn->name, "pci")) + if (!of_node_name_eq(dn, "pci")) return 0; /* If this is not a hotplug slot, return without doing anything. */ diff --git a/drivers/pci/of.c b/drivers/pci/of.c index 4c4217d0c3f1..3d32da15c215 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -113,7 +113,7 @@ struct device_node *of_pci_find_child_device(struct device_node *parent, * a fake root for all functions of a multi-function * device we go down them as well. */ - if (!strcmp(node->name, "multifunc-device")) { + if (of_node_name_eq(node, "multifunc-device")) { for_each_child_of_node(node, node2) { if (__of_pci_pci_compare(node2, devfn)) { of_node_put(node);