Commit 2ef790dc authored by Rob Herring's avatar Rob Herring
Browse files

irqchip: 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.

Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 229c55cc

drivers/irqchip/irq-gic-v3.c

+2 −2
Original line number Diff line number Diff line
@@ -1184,8 +1184,8 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node) 


		part->partition_id = of_node_to_fwnode(child_part);



		pr_info("GIC: PPI partition %s[%d] { ",

			child_part->name, part_idx);

		pr_info("GIC: PPI partition %pOFn[%d] { ",

			child_part, part_idx);



		n = of_property_count_elems_of_size(child_part, "affinity",

						    sizeof(u32));

drivers/irqchip/irq-mscc-ocelot.c

+3 −3
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static int __init ocelot_irq_init(struct device_node *node, 
	domain = irq_domain_add_linear(node, OCELOT_NR_IRQ,

				       &irq_generic_chip_ops, NULL);

	if (!domain) {

		pr_err("%s: unable to add irq domain\n", node->name);

		pr_err("%pOFn: unable to add irq domain\n", node);

		return -ENOMEM;

	}
@@ -80,14 +80,14 @@ static int __init ocelot_irq_init(struct device_node *node, 
					     "icpu", handle_level_irq,

					     0, 0, 0);

	if (ret) {

		pr_err("%s: unable to alloc irq domain gc\n", node->name);

		pr_err("%pOFn: unable to alloc irq domain gc\n", node);

		goto err_domain_remove;

	}



	gc = irq_get_domain_generic_chip(domain, 0);

	gc->reg_base = of_iomap(node, 0);

	if (!gc->reg_base) {

		pr_err("%s: unable to map resource\n", node->name);

		pr_err("%pOFn: unable to map resource\n", node);

		ret = -ENOMEM;

		goto err_gc_free;

	}

drivers/irqchip/irq-orion.c

+11 −11
Original line number Diff line number Diff line
@@ -64,14 +64,14 @@ static int __init orion_irq_init(struct device_node *np, 
				num_chips * ORION_IRQS_PER_CHIP,

				&irq_generic_chip_ops, NULL);

	if (!orion_irq_domain)

		panic("%s: unable to add irq domain\n", np->name);

		panic("%pOFn: unable to add irq domain\n", np);



	ret = irq_alloc_domain_generic_chips(orion_irq_domain,

				ORION_IRQS_PER_CHIP, 1, np->name,

				ORION_IRQS_PER_CHIP, 1, np->full_name,

				handle_level_irq, clr, 0,

				IRQ_GC_INIT_MASK_CACHE);

	if (ret)

		panic("%s: unable to alloc irq domain gc\n", np->name);

		panic("%pOFn: unable to alloc irq domain gc\n", np);



	for (n = 0, base = 0; n < num_chips; n++, base += ORION_IRQS_PER_CHIP) {

		struct irq_chip_generic *gc =
@@ -80,12 +80,12 @@ static int __init orion_irq_init(struct device_node *np, 
		of_address_to_resource(np, n, &r);



		if (!request_mem_region(r.start, resource_size(&r), np->name))

			panic("%s: unable to request mem region %d",

			      np->name, n);

			panic("%pOFn: unable to request mem region %d",

			      np, n);



		gc->reg_base = ioremap(r.start, resource_size(&r));

		if (!gc->reg_base)

			panic("%s: unable to map resource %d", np->name, n);

			panic("%pOFn: unable to map resource %d", np, n);



		gc->chip_types[0].regs.mask = ORION_IRQ_MASK;

		gc->chip_types[0].chip.irq_mask = irq_gc_mask_clr_bit;
@@ -150,20 +150,20 @@ static int __init orion_bridge_irq_init(struct device_node *np, 
	domain = irq_domain_add_linear(np, nrirqs,

				       &irq_generic_chip_ops, NULL);

	if (!domain) {

		pr_err("%s: unable to add irq domain\n", np->name);

		pr_err("%pOFn: unable to add irq domain\n", np);

		return -ENOMEM;

	}



	ret = irq_alloc_domain_generic_chips(domain, nrirqs, 1, np->name,

			     handle_edge_irq, clr, 0, IRQ_GC_INIT_MASK_CACHE);

	if (ret) {

		pr_err("%s: unable to alloc irq domain gc\n", np->name);

		pr_err("%pOFn: unable to alloc irq domain gc\n", np);

		return ret;

	}



	ret = of_address_to_resource(np, 0, &r);

	if (ret) {

		pr_err("%s: unable to get resource\n", np->name);

		pr_err("%pOFn: unable to get resource\n", np);

		return ret;

	}
@@ -175,14 +175,14 @@ static int __init orion_bridge_irq_init(struct device_node *np, 
	/* Map the parent interrupt for the chained handler */

	irq = irq_of_parse_and_map(np, 0);

	if (irq <= 0) {

		pr_err("%s: unable to parse irq\n", np->name);

		pr_err("%pOFn: unable to parse irq\n", np);

		return -EINVAL;

	}



	gc = irq_get_domain_generic_chip(domain, 0);

	gc->reg_base = ioremap(r.start, resource_size(&r));

	if (!gc->reg_base) {

		pr_err("%s: unable to map resource\n", np->name);

		pr_err("%pOFn: unable to map resource\n", np);

		return -ENOMEM;

	}

drivers/irqchip/irq-stm32-exti.c

+3 −3
Original line number Diff line number Diff line
@@ -678,8 +678,8 @@ static int __init stm32_exti_init(const struct stm32_exti_drv_data *drv_data, 
	domain = irq_domain_add_linear(node, drv_data->bank_nr * IRQS_PER_BANK,

				       &irq_exti_domain_ops, NULL);

	if (!domain) {

		pr_err("%s: Could not register interrupt domain.\n",

		       node->name);

		pr_err("%pOFn: Could not register interrupt domain.\n",

		       node);

		ret = -ENOMEM;

		goto out_unmap;

	}
@@ -768,7 +768,7 @@ __init stm32_exti_hierarchy_init(const struct stm32_exti_drv_data *drv_data, 
					  host_data);



	if (!domain) {

		pr_err("%s: Could not register exti domain.\n", node->name);

		pr_err("%pOFn: Could not register exti domain.\n", node);

		ret = -ENOMEM;

		goto out_unmap;

	}

drivers/irqchip/irq-tango.c

+5 −5
Original line number Diff line number Diff line
@@ -184,11 +184,11 @@ static int __init tangox_irq_init(void __iomem *base, struct resource *baseres, 


	irq = irq_of_parse_and_map(node, 0);

	if (!irq)

		panic("%s: failed to get IRQ", node->name);

		panic("%pOFn: failed to get IRQ", node);



	err = of_address_to_resource(node, 0, &res);

	if (err)

		panic("%s: failed to get address", node->name);

		panic("%pOFn: failed to get address", node);



	chip = kzalloc(sizeof(*chip), GFP_KERNEL);

	chip->ctl = res.start - baseres->start;
@@ -196,12 +196,12 @@ static int __init tangox_irq_init(void __iomem *base, struct resource *baseres, 


	dom = irq_domain_add_linear(node, 64, &irq_generic_chip_ops, chip);

	if (!dom)

		panic("%s: failed to create irqdomain", node->name);

		panic("%pOFn: failed to create irqdomain", node);



	err = irq_alloc_domain_generic_chips(dom, 32, 2, node->name,

					     handle_level_irq, 0, 0, 0);

	if (err)

		panic("%s: failed to allocate irqchip", node->name);

		panic("%pOFn: failed to allocate irqchip", node);



	tangox_irq_domain_init(dom);
@@ -219,7 +219,7 @@ static int __init tangox_of_irq_init(struct device_node *node, 


	base = of_iomap(node, 0);

	if (!base)

		panic("%s: of_iomap failed", node->name);

		panic("%pOFn: of_iomap failed", node);



	of_address_to_resource(node, 0, &res);

CRA Git | Maintained and supported by SUSTech CRA and CCSE