提交 d9c5d5ac 编写于 作者: J Jan Kiszka 提交者: Bjorn Helgaas

PCI: Use dev_printk() in of_pci_get_host_bridge_resources()

Now that we have a device reference, make use of it for printing.
Tested-by: NVladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Signed-off-by: NJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: NBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: NVladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
上级 055f87a2
...@@ -282,15 +282,15 @@ int of_pci_get_host_bridge_resources(struct device *dev, ...@@ -282,15 +282,15 @@ int of_pci_get_host_bridge_resources(struct device *dev,
if (!bus_range) if (!bus_range)
return -ENOMEM; return -ENOMEM;
pr_info("host bridge %pOF ranges:\n", dev_node); dev_info(dev, "host bridge %pOF ranges:\n", dev_node);
err = of_pci_parse_bus_range(dev_node, bus_range); err = of_pci_parse_bus_range(dev_node, bus_range);
if (err) { if (err) {
bus_range->start = busno; bus_range->start = busno;
bus_range->end = bus_max; bus_range->end = bus_max;
bus_range->flags = IORESOURCE_BUS; bus_range->flags = IORESOURCE_BUS;
pr_info(" No bus range found for %pOF, using %pR\n", dev_info(dev, " No bus range found for %pOF, using %pR\n",
dev_node, bus_range); dev_node, bus_range);
} else { } else {
if (bus_range->end > bus_range->start + bus_max) if (bus_range->end > bus_range->start + bus_max)
bus_range->end = bus_range->start + bus_max; bus_range->end = bus_range->start + bus_max;
...@@ -302,7 +302,7 @@ int of_pci_get_host_bridge_resources(struct device *dev, ...@@ -302,7 +302,7 @@ int of_pci_get_host_bridge_resources(struct device *dev,
if (err) if (err)
goto parse_failed; goto parse_failed;
pr_debug("Parsing ranges property...\n"); dev_dbg(dev, "Parsing ranges property...\n");
for_each_of_pci_range(&parser, &range) { for_each_of_pci_range(&parser, &range) {
/* Read next ranges element */ /* Read next ranges element */
if ((range.flags & IORESOURCE_TYPE_BITS) == IORESOURCE_IO) if ((range.flags & IORESOURCE_TYPE_BITS) == IORESOURCE_IO)
...@@ -311,9 +311,9 @@ int of_pci_get_host_bridge_resources(struct device *dev, ...@@ -311,9 +311,9 @@ int of_pci_get_host_bridge_resources(struct device *dev,
snprintf(range_type, 4, "MEM"); snprintf(range_type, 4, "MEM");
else else
snprintf(range_type, 4, "err"); snprintf(range_type, 4, "err");
pr_info(" %s %#010llx..%#010llx -> %#010llx\n", range_type, dev_info(dev, " %s %#010llx..%#010llx -> %#010llx\n",
range.cpu_addr, range.cpu_addr + range.size - 1, range_type, range.cpu_addr,
range.pci_addr); range.cpu_addr + range.size - 1, range.pci_addr);
/* /*
* If we failed translation or got a zero-sized region * If we failed translation or got a zero-sized region
...@@ -336,14 +336,14 @@ int of_pci_get_host_bridge_resources(struct device *dev, ...@@ -336,14 +336,14 @@ int of_pci_get_host_bridge_resources(struct device *dev,
if (resource_type(res) == IORESOURCE_IO) { if (resource_type(res) == IORESOURCE_IO) {
if (!io_base) { if (!io_base) {
pr_err("I/O range found for %pOF. Please provide an io_base pointer to save CPU base address\n", dev_err(dev, "I/O range found for %pOF. Please provide an io_base pointer to save CPU base address\n",
dev_node); dev_node);
err = -EINVAL; err = -EINVAL;
goto conversion_failed; goto conversion_failed;
} }
if (*io_base != (resource_size_t)OF_BAD_ADDR) if (*io_base != (resource_size_t)OF_BAD_ADDR)
pr_warn("More than one I/O resource converted for %pOF. CPU base address for old range lost!\n", dev_warn(dev, "More than one I/O resource converted for %pOF. CPU base address for old range lost!\n",
dev_node); dev_node);
*io_base = range.cpu_addr; *io_base = range.cpu_addr;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册