Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2b8ae0e authored by Rob Herring's avatar Rob Herring
Browse files

microblaze: Convert to using %pOF instead of full_name 



Now that we have a custom printf format specifier, convert users of
full_name to use %pOF instead. This is preparation to remove storing
of the full path string for each node.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Cc: Michal Simek <monstr@monstr.eu>
parent 58156258

arch/microblaze/kernel/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ static int __init xilinx_timer_init(struct device_node *timer) 
		return -EINVAL;

	}



	pr_info("%s: irq=%d\n", timer->full_name, irq);

	pr_info("%pOF: irq=%d\n", timer, irq);



	clk = of_clk_get(timer, 0);

	if (IS_ERR(clk)) {

arch/microblaze/pci/pci-common.c

+7 −7
Original line number Diff line number Diff line
@@ -508,8 +508,8 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose, 
	struct of_pci_range range;

	struct of_pci_range_parser parser;



	pr_info("PCI host bridge %s %s ranges:\n",

	       dev->full_name, primary ? "(primary)" : "");

	pr_info("PCI host bridge %pOF %s ranges:\n",

	       dev, primary ? "(primary)" : "");



	/* Check for ranges property */

	if (of_pci_range_parser_init(&parser, dev))
@@ -1219,8 +1219,8 @@ static void pcibios_setup_phb_resources(struct pci_controller *hose, 


	if (!res->flags) {

		pr_warn("PCI: I/O resource not set for host ");

		pr_cont("bridge %s (domain %d)\n",

			hose->dn->full_name, hose->global_number);

		pr_cont("bridge %pOF (domain %d)\n",

			hose->dn, hose->global_number);

		/* Workaround for lack of IO resource only on 32-bit */

		res->start = (unsigned long)hose->io_base_virt - isa_io_base;

		res->end = res->start + IO_SPACE_LIMIT;
@@ -1241,8 +1241,8 @@ static void pcibios_setup_phb_resources(struct pci_controller *hose, 
			if (i > 0)

				continue;

			pr_err("PCI: Memory resource 0 not set for ");

			pr_cont("host bridge %s (domain %d)\n",

				hose->dn->full_name, hose->global_number);

			pr_cont("host bridge %pOF (domain %d)\n",

				hose->dn, hose->global_number);



			/* Workaround for lack of MEM resource only on 32-bit */

			res->start = hose->pci_mem_offset;
@@ -1270,7 +1270,7 @@ static void pcibios_scan_phb(struct pci_controller *hose) 
	struct pci_bus *bus;

	struct device_node *node = hose->dn;



	pr_debug("PCI: Scanning PHB %s\n", of_node_full_name(node));

	pr_debug("PCI: Scanning PHB %pOF\n", node);



	pcibios_setup_phb_resources(hose, &resources);