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: 10714827 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DC4FD13BB for ; Wed, 5 Dec 2018 19:53:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CEC0D2E3BC for ; Wed, 5 Dec 2018 19:53:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CCDF52E3C4; Wed, 5 Dec 2018 19:53:00 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 448632E3BD for ; Wed, 5 Dec 2018 19:53:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728421AbeLETww (ORCPT ); Wed, 5 Dec 2018 14:52:52 -0500 Received: from mail-oi1-f195.google.com ([209.85.167.195]:45246 "EHLO mail-oi1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728761AbeLETvM (ORCPT ); Wed, 5 Dec 2018 14:51:12 -0500 Received: by mail-oi1-f195.google.com with SMTP id b141so18619286oii.12; Wed, 05 Dec 2018 11:51:12 -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=claS0pWtT54BKqWE0l6k2GF7a3BFEF0AnjkHfp0F31r7txs+8qNQPP5ZG0UFGAEMe4 RB+y6Vzz/EEXUR/AjzxCr0ccE87zpHjmvQ1TRf1DXhNeyVse/YAOaomA0U9fsS4iwuZn aJCkVOxP0TtxOsNvshoyZ1ymts+X6M+0DLeuq8Cdn2zSe4C+DM7oKZj/9ynigAeP4ius Du+6Pmjvb4JJoRwHcT6zRhCRGWKiyfhWcRcBH0CuhI6W6v5QeAK/QyDApVlPcvCUUjyW UUM8jFkovwHaFu5MDug/rS1LxdL+qCi0A44ijBBMfyXGODeu7b9xbwePnw/tQXM1Dqnh 9PVA== X-Gm-Message-State: AA+aEWZl4J4VxQebaDAAVYrcnXfvs7MejfXoFOrNMx0as/KVM3VL6Ldx cRyKQS0ZBVV6Bujk8ReGtGkCK78= 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 Cc: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Bjorn Helgaas , linuxppc-dev@lists.ozlabs.org, linux-pci@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 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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);