Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

soc: Convert to using %pOFn instead of device_node.name

In preparation to remove the node name pointer from struct device_node,
convert printf users to use the %pOFn format specifier.

Cc: Li Yang <leoyang.li@nxp.com>
Cc: David Brown <david.brown@linaro.org>
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: Santosh Shilimkar <ssantosh@kernel.org>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-soc@vger.kernel.org
Acked-by: Thierry Reding <treding@nvidia.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Qiang Zhao <qiang.zhao@nxp.com>
Acked-by: Andy Gross <andy.gross@linaro.org>
Signed-off-by: Rob Herring <robh@kernel.org>

+43 -43
+4 -4
drivers/soc/dove/pmu.c
··· 383 383 384 384 domains_node = of_get_child_by_name(np_pmu, "domains"); 385 385 if (!domains_node) { 386 - pr_err("%s: failed to find domains sub-node\n", np_pmu->name); 386 + pr_err("%pOFn: failed to find domains sub-node\n", np_pmu); 387 387 return 0; 388 388 } 389 389 ··· 396 396 pmu->pmc_base = of_iomap(pmu->of_node, 0); 397 397 pmu->pmu_base = of_iomap(pmu->of_node, 1); 398 398 if (!pmu->pmc_base || !pmu->pmu_base) { 399 - pr_err("%s: failed to map PMU\n", np_pmu->name); 399 + pr_err("%pOFn: failed to map PMU\n", np_pmu); 400 400 iounmap(pmu->pmu_base); 401 401 iounmap(pmu->pmc_base); 402 402 kfree(pmu); ··· 414 414 break; 415 415 416 416 domain->pmu = pmu; 417 - domain->base.name = kstrdup(np->name, GFP_KERNEL); 417 + domain->base.name = kasprintf(GFP_KERNEL, "%pOFn", np); 418 418 if (!domain->base.name) { 419 419 kfree(domain); 420 420 break; ··· 444 444 /* Loss of the interrupt controller is not a fatal error. */ 445 445 parent_irq = irq_of_parse_and_map(pmu->of_node, 0); 446 446 if (!parent_irq) { 447 - pr_err("%s: no interrupt specified\n", np_pmu->name); 447 + pr_err("%pOFn: no interrupt specified\n", np_pmu); 448 448 } else { 449 449 ret = dove_init_pmu_irq(pmu, parent_irq); 450 450 if (ret)
+2 -2
drivers/soc/fsl/qe/qe_tdm.c
··· 131 131 132 132 pdev = of_find_device_by_node(np2); 133 133 if (!pdev) { 134 - pr_err("%s: failed to lookup pdev\n", np2->name); 134 + pr_err("%pOFn: failed to lookup pdev\n", np2); 135 135 of_node_put(np2); 136 136 return -EINVAL; 137 137 } ··· 153 153 pdev = of_find_device_by_node(np2); 154 154 if (!pdev) { 155 155 ret = -EINVAL; 156 - pr_err("%s: failed to lookup pdev\n", np2->name); 156 + pr_err("%pOFn: failed to lookup pdev\n", np2); 157 157 of_node_put(np2); 158 158 goto err_miss_siram_property; 159 159 }
+1 -1
drivers/soc/qcom/apr.c
··· 219 219 adev->domain_id = id->domain_id; 220 220 adev->version = id->svc_version; 221 221 if (np) 222 - strncpy(adev->name, np->name, APR_NAME_SIZE); 222 + snprintf(adev->name, APR_NAME_SIZE, "%pOFn", np); 223 223 else 224 224 strncpy(adev->name, id->name, APR_NAME_SIZE); 225 225
+22 -22
drivers/soc/rockchip/pm_domains.c
··· 392 392 error = of_property_read_u32(node, "reg", &id); 393 393 if (error) { 394 394 dev_err(pmu->dev, 395 - "%s: failed to retrieve domain id (reg): %d\n", 396 - node->name, error); 395 + "%pOFn: failed to retrieve domain id (reg): %d\n", 396 + node, error); 397 397 return -EINVAL; 398 398 } 399 399 400 400 if (id >= pmu->info->num_domains) { 401 - dev_err(pmu->dev, "%s: invalid domain id %d\n", 402 - node->name, id); 401 + dev_err(pmu->dev, "%pOFn: invalid domain id %d\n", 402 + node, id); 403 403 return -EINVAL; 404 404 } 405 405 406 406 pd_info = &pmu->info->domain_info[id]; 407 407 if (!pd_info) { 408 - dev_err(pmu->dev, "%s: undefined domain id %d\n", 409 - node->name, id); 408 + dev_err(pmu->dev, "%pOFn: undefined domain id %d\n", 409 + node, id); 410 410 return -EINVAL; 411 411 } 412 412 ··· 424 424 if (!pd->clks) 425 425 return -ENOMEM; 426 426 } else { 427 - dev_dbg(pmu->dev, "%s: doesn't have clocks: %d\n", 428 - node->name, pd->num_clks); 427 + dev_dbg(pmu->dev, "%pOFn: doesn't have clocks: %d\n", 428 + node, pd->num_clks); 429 429 pd->num_clks = 0; 430 430 } 431 431 ··· 434 434 if (IS_ERR(pd->clks[i].clk)) { 435 435 error = PTR_ERR(pd->clks[i].clk); 436 436 dev_err(pmu->dev, 437 - "%s: failed to get clk at index %d: %d\n", 438 - node->name, i, error); 437 + "%pOFn: failed to get clk at index %d: %d\n", 438 + node, i, error); 439 439 return error; 440 440 } 441 441 } ··· 486 486 error = rockchip_pd_power(pd, true); 487 487 if (error) { 488 488 dev_err(pmu->dev, 489 - "failed to power on domain '%s': %d\n", 490 - node->name, error); 489 + "failed to power on domain '%pOFn': %d\n", 490 + node, error); 491 491 goto err_unprepare_clocks; 492 492 } 493 493 ··· 575 575 error = of_property_read_u32(parent, "reg", &idx); 576 576 if (error) { 577 577 dev_err(pmu->dev, 578 - "%s: failed to retrieve domain id (reg): %d\n", 579 - parent->name, error); 578 + "%pOFn: failed to retrieve domain id (reg): %d\n", 579 + parent, error); 580 580 goto err_out; 581 581 } 582 582 parent_domain = pmu->genpd_data.domains[idx]; 583 583 584 584 error = rockchip_pm_add_one_domain(pmu, np); 585 585 if (error) { 586 - dev_err(pmu->dev, "failed to handle node %s: %d\n", 587 - np->name, error); 586 + dev_err(pmu->dev, "failed to handle node %pOFn: %d\n", 587 + np, error); 588 588 goto err_out; 589 589 } 590 590 591 591 error = of_property_read_u32(np, "reg", &idx); 592 592 if (error) { 593 593 dev_err(pmu->dev, 594 - "%s: failed to retrieve domain id (reg): %d\n", 595 - np->name, error); 594 + "%pOFn: failed to retrieve domain id (reg): %d\n", 595 + np, error); 596 596 goto err_out; 597 597 } 598 598 child_domain = pmu->genpd_data.domains[idx]; ··· 683 683 for_each_available_child_of_node(np, node) { 684 684 error = rockchip_pm_add_one_domain(pmu, node); 685 685 if (error) { 686 - dev_err(dev, "failed to handle node %s: %d\n", 687 - node->name, error); 686 + dev_err(dev, "failed to handle node %pOFn: %d\n", 687 + node, error); 688 688 of_node_put(node); 689 689 goto err_out; 690 690 } 691 691 692 692 error = rockchip_pm_add_subdomain(pmu, node); 693 693 if (error < 0) { 694 - dev_err(dev, "failed to handle subdomain node %s: %d\n", 695 - node->name, error); 694 + dev_err(dev, "failed to handle subdomain node %pOFn: %d\n", 695 + node, error); 696 696 of_node_put(node); 697 697 goto err_out; 698 698 }
+6 -6
drivers/soc/tegra/pmc.c
··· 796 796 797 797 id = tegra_powergate_lookup(pmc, np->name); 798 798 if (id < 0) { 799 - pr_err("powergate lookup failed for %s: %d\n", np->name, id); 799 + pr_err("powergate lookup failed for %pOFn: %d\n", np, id); 800 800 goto free_mem; 801 801 } 802 802 ··· 816 816 817 817 err = tegra_powergate_of_get_clks(pg, np); 818 818 if (err < 0) { 819 - pr_err("failed to get clocks for %s: %d\n", np->name, err); 819 + pr_err("failed to get clocks for %pOFn: %d\n", np, err); 820 820 goto set_available; 821 821 } 822 822 823 823 err = tegra_powergate_of_get_resets(pg, np, off); 824 824 if (err < 0) { 825 - pr_err("failed to get resets for %s: %d\n", np->name, err); 825 + pr_err("failed to get resets for %pOFn: %d\n", np, err); 826 826 goto remove_clks; 827 827 } 828 828 ··· 851 851 852 852 err = pm_genpd_init(&pg->genpd, NULL, off); 853 853 if (err < 0) { 854 - pr_err("failed to initialise PM domain %s: %d\n", np->name, 854 + pr_err("failed to initialise PM domain %pOFn: %d\n", np, 855 855 err); 856 856 goto remove_resets; 857 857 } 858 858 859 859 err = of_genpd_add_provider_simple(np, &pg->genpd); 860 860 if (err < 0) { 861 - pr_err("failed to add PM domain provider for %s: %d\n", 862 - np->name, err); 861 + pr_err("failed to add PM domain provider for %pOFn: %d\n", 862 + np, err); 863 863 goto remove_genpd; 864 864 } 865 865
+4 -4
drivers/soc/ti/knav_dma.c
··· 544 544 545 545 ret = of_address_to_resource(node, index, &res); 546 546 if (ret) { 547 - dev_err(dev, "Can't translate of node(%s) address for index(%d)\n", 548 - node->name, index); 547 + dev_err(dev, "Can't translate of node(%pOFn) address for index(%d)\n", 548 + node, index); 549 549 return ERR_PTR(ret); 550 550 } 551 551 552 552 regs = devm_ioremap_resource(kdev->dev, &res); 553 553 if (IS_ERR(regs)) 554 - dev_err(dev, "Failed to map register base for index(%d) node(%s)\n", 555 - index, node->name); 554 + dev_err(dev, "Failed to map register base for index(%d) node(%pOFn)\n", 555 + index, node); 556 556 if (_size) 557 557 *_size = resource_size(&res); 558 558
+4 -4
drivers/soc/ti/knav_qmss_queue.c
··· 1382 1382 1383 1383 ret = of_address_to_resource(node, index, &res); 1384 1384 if (ret) { 1385 - dev_err(kdev->dev, "Can't translate of node(%s) address for index(%d)\n", 1386 - node->name, index); 1385 + dev_err(kdev->dev, "Can't translate of node(%pOFn) address for index(%d)\n", 1386 + node, index); 1387 1387 return ERR_PTR(ret); 1388 1388 } 1389 1389 1390 1390 regs = devm_ioremap_resource(kdev->dev, &res); 1391 1391 if (IS_ERR(regs)) 1392 - dev_err(kdev->dev, "Failed to map register base for index(%d) node(%s)\n", 1393 - index, node->name); 1392 + dev_err(kdev->dev, "Failed to map register base for index(%d) node(%pOFn)\n", 1393 + index, node); 1394 1394 return regs; 1395 1395 } 1396 1396