summaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2017-09-07 13:24:16 -0500
committerBjorn Helgaas <bhelgaas@google.com>2017-09-07 13:24:16 -0500
commit33db87de6ab7ba9a3cca5b57033621ad154c1d0a (patch)
tree8a3d0d277ba56d33844fbd9e4141e32e4470398c /drivers/pci/pci.c
parentd4fdf844c9c3debc080aea1be8b71d9d0aaa01dc (diff)
parentea5311c7e752dbec9bfbdd79992a8772b37f32fa (diff)
downloadlinux-33db87de6ab7ba9a3cca5b57033621ad154c1d0a.tar.gz
linux-33db87de6ab7ba9a3cca5b57033621ad154c1d0a.tar.bz2
linux-33db87de6ab7ba9a3cca5b57033621ad154c1d0a.zip
Merge branch 'pci/misc' into next
* pci/misc: PCI: Fix PCIe capability sizes PCI: Convert to using %pOF instead of full_name() PCI: Constify endpoint pci_epf_type device_type PCI: Constify bin_attribute structures PCI: Constify hotplug pci_device_id structures PCI: Constify hotplug attribute_group structures PCI: Constify label attribute_group structures PCI: Constify sysfs attribute_group structures
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r--drivers/pci/pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 827a9f99a8e5..90d070ec1026 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -5394,8 +5394,8 @@ static int of_pci_bus_find_domain_nr(struct device *parent)
use_dt_domains = 0;
domain = pci_get_new_domain_nr();
} else {
- dev_err(parent, "Node %s has inconsistent \"linux,pci-domain\" property in DT\n",
- parent->of_node->full_name);
+ dev_err(parent, "Node %pOF has inconsistent \"linux,pci-domain\" property in DT\n",
+ parent->of_node);
domain = -1;
}