aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/of.c
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2018-05-15 05:07:02 -0400
committerBjorn Helgaas <helgaas@kernel.org>2018-05-30 12:34:49 -0400
commit126b7de6bfd84b2daadca2c3396108cd847adb5d (patch)
tree552b676de47321934f476f7df889b9fb1d3d0721 /drivers/pci/of.c
parent3bbce531788719749520f28052cabdef16af6b16 (diff)
PCI: Rename of_pci_get_host_bridge_resources() device node parameter
We will add a "struct device *dev" parameter to this function soon, so rename the existing "struct device_node *dev" parameter to "dev_node". 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>
Diffstat (limited to 'drivers/pci/of.c')
-rw-r--r--drivers/pci/of.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index a28355c273ae..8d4778ef5806 100644
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -245,7 +245,7 @@ EXPORT_SYMBOL_GPL(of_pci_check_probe_only);
245#if defined(CONFIG_OF_ADDRESS) 245#if defined(CONFIG_OF_ADDRESS)
246/** 246/**
247 * of_pci_get_host_bridge_resources - Parse PCI host bridge resources from DT 247 * of_pci_get_host_bridge_resources - Parse PCI host bridge resources from DT
248 * @dev: device node of the host bridge having the range property 248 * @dev_node: device node of the host bridge having the range property
249 * @busno: bus number associated with the bridge root bus 249 * @busno: bus number associated with the bridge root bus
250 * @bus_max: maximum number of buses for this bridge 250 * @bus_max: maximum number of buses for this bridge
251 * @resources: list where the range of resources will be added after DT parsing 251 * @resources: list where the range of resources will be added after DT parsing
@@ -262,7 +262,7 @@ EXPORT_SYMBOL_GPL(of_pci_check_probe_only);
262 * It returns zero if the range parsing has been successful or a standard error 262 * It returns zero if the range parsing has been successful or a standard error
263 * value if it failed. 263 * value if it failed.
264 */ 264 */
265int of_pci_get_host_bridge_resources(struct device_node *dev, 265int of_pci_get_host_bridge_resources(struct device_node *dev_node,
266 unsigned char busno, unsigned char bus_max, 266 unsigned char busno, unsigned char bus_max,
267 struct list_head *resources, resource_size_t *io_base) 267 struct list_head *resources, resource_size_t *io_base)
268{ 268{
@@ -281,15 +281,15 @@ int of_pci_get_host_bridge_resources(struct device_node *dev,
281 if (!bus_range) 281 if (!bus_range)
282 return -ENOMEM; 282 return -ENOMEM;
283 283
284 pr_info("host bridge %pOF ranges:\n", dev); 284 pr_info("host bridge %pOF ranges:\n", dev_node);
285 285
286 err = of_pci_parse_bus_range(dev, bus_range); 286 err = of_pci_parse_bus_range(dev_node, bus_range);
287 if (err) { 287 if (err) {
288 bus_range->start = busno; 288 bus_range->start = busno;
289 bus_range->end = bus_max; 289 bus_range->end = bus_max;
290 bus_range->flags = IORESOURCE_BUS; 290 bus_range->flags = IORESOURCE_BUS;
291 pr_info(" No bus range found for %pOF, using %pR\n", 291 pr_info(" No bus range found for %pOF, using %pR\n",
292 dev, bus_range); 292 dev_node, bus_range);
293 } else { 293 } else {
294 if (bus_range->end > bus_range->start + bus_max) 294 if (bus_range->end > bus_range->start + bus_max)
295 bus_range->end = bus_range->start + bus_max; 295 bus_range->end = bus_range->start + bus_max;
@@ -297,7 +297,7 @@ int of_pci_get_host_bridge_resources(struct device_node *dev,
297 pci_add_resource(resources, bus_range); 297 pci_add_resource(resources, bus_range);
298 298
299 /* Check for ranges property */ 299 /* Check for ranges property */
300 err = of_pci_range_parser_init(&parser, dev); 300 err = of_pci_range_parser_init(&parser, dev_node);
301 if (err) 301 if (err)
302 goto parse_failed; 302 goto parse_failed;
303 303
@@ -327,7 +327,7 @@ int of_pci_get_host_bridge_resources(struct device_node *dev,
327 goto parse_failed; 327 goto parse_failed;
328 } 328 }
329 329
330 err = of_pci_range_to_resource(&range, dev, res); 330 err = of_pci_range_to_resource(&range, dev_node, res);
331 if (err) { 331 if (err) {
332 kfree(res); 332 kfree(res);
333 continue; 333 continue;
@@ -336,13 +336,13 @@ int of_pci_get_host_bridge_resources(struct device_node *dev,
336 if (resource_type(res) == IORESOURCE_IO) { 336 if (resource_type(res) == IORESOURCE_IO) {
337 if (!io_base) { 337 if (!io_base) {
338 pr_err("I/O range found for %pOF. Please provide an io_base pointer to save CPU base address\n", 338 pr_err("I/O range found for %pOF. Please provide an io_base pointer to save CPU base address\n",
339 dev); 339 dev_node);
340 err = -EINVAL; 340 err = -EINVAL;
341 goto conversion_failed; 341 goto conversion_failed;
342 } 342 }
343 if (*io_base != (resource_size_t)OF_BAD_ADDR) 343 if (*io_base != (resource_size_t)OF_BAD_ADDR)
344 pr_warn("More than one I/O resource converted for %pOF. CPU base address for old range lost!\n", 344 pr_warn("More than one I/O resource converted for %pOF. CPU base address for old range lost!\n",
345 dev); 345 dev_node);
346 *io_base = range.cpu_addr; 346 *io_base = range.cpu_addr;
347 } 347 }
348 348