aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2018-05-15 05:07:04 -0400
committerBjorn Helgaas <helgaas@kernel.org>2018-05-30 12:35:06 -0400
commitd9c5d5ac287caaa1bc17406ee16ce20f124e5583 (patch)
treec4a24ac24cb6c4bc166f8e4d663767feb5459cd3
parent055f87a2a33640923d400fd5c3ebfff24198459f (diff)
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: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
-rw-r--r--drivers/pci/of.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index ac97491ba377..820fe058d116 100644
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -282,15 +282,15 @@ int of_pci_get_host_bridge_resources(struct device *dev,
282 if (!bus_range) 282 if (!bus_range)
283 return -ENOMEM; 283 return -ENOMEM;
284 284
285 pr_info("host bridge %pOF ranges:\n", dev_node); 285 dev_info(dev, "host bridge %pOF ranges:\n", dev_node);
286 286
287 err = of_pci_parse_bus_range(dev_node, bus_range); 287 err = of_pci_parse_bus_range(dev_node, bus_range);
288 if (err) { 288 if (err) {
289 bus_range->start = busno; 289 bus_range->start = busno;
290 bus_range->end = bus_max; 290 bus_range->end = bus_max;
291 bus_range->flags = IORESOURCE_BUS; 291 bus_range->flags = IORESOURCE_BUS;
292 pr_info(" No bus range found for %pOF, using %pR\n", 292 dev_info(dev, " No bus range found for %pOF, using %pR\n",
293 dev_node, bus_range); 293 dev_node, bus_range);
294 } else { 294 } else {
295 if (bus_range->end > bus_range->start + bus_max) 295 if (bus_range->end > bus_range->start + bus_max)
296 bus_range->end = bus_range->start + bus_max; 296 bus_range->end = bus_range->start + bus_max;
@@ -302,7 +302,7 @@ int of_pci_get_host_bridge_resources(struct device *dev,
302 if (err) 302 if (err)
303 goto parse_failed; 303 goto parse_failed;
304 304
305 pr_debug("Parsing ranges property...\n"); 305 dev_dbg(dev, "Parsing ranges property...\n");
306 for_each_of_pci_range(&parser, &range) { 306 for_each_of_pci_range(&parser, &range) {
307 /* Read next ranges element */ 307 /* Read next ranges element */
308 if ((range.flags & IORESOURCE_TYPE_BITS) == IORESOURCE_IO) 308 if ((range.flags & IORESOURCE_TYPE_BITS) == IORESOURCE_IO)
@@ -311,9 +311,9 @@ int of_pci_get_host_bridge_resources(struct device *dev,
311 snprintf(range_type, 4, "MEM"); 311 snprintf(range_type, 4, "MEM");
312 else 312 else
313 snprintf(range_type, 4, "err"); 313 snprintf(range_type, 4, "err");
314 pr_info(" %s %#010llx..%#010llx -> %#010llx\n", range_type, 314 dev_info(dev, " %s %#010llx..%#010llx -> %#010llx\n",
315 range.cpu_addr, range.cpu_addr + range.size - 1, 315 range_type, range.cpu_addr,
316 range.pci_addr); 316 range.cpu_addr + range.size - 1, range.pci_addr);
317 317
318 /* 318 /*
319 * If we failed translation or got a zero-sized region 319 * 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 336
337 if (resource_type(res) == IORESOURCE_IO) { 337 if (resource_type(res) == IORESOURCE_IO) {
338 if (!io_base) { 338 if (!io_base) {
339 pr_err("I/O range found for %pOF. Please provide an io_base pointer to save CPU base address\n", 339 dev_err(dev, "I/O range found for %pOF. Please provide an io_base pointer to save CPU base address\n",
340 dev_node); 340 dev_node);
341 err = -EINVAL; 341 err = -EINVAL;
342 goto conversion_failed; 342 goto conversion_failed;
343 } 343 }
344 if (*io_base != (resource_size_t)OF_BAD_ADDR) 344 if (*io_base != (resource_size_t)OF_BAD_ADDR)
345 pr_warn("More than one I/O resource converted for %pOF. CPU base address for old range lost!\n", 345 dev_warn(dev, "More than one I/O resource converted for %pOF. CPU base address for old range lost!\n",
346 dev_node); 346 dev_node);
347 *io_base = range.cpu_addr; 347 *io_base = range.cpu_addr;
348 } 348 }
349 349