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

Commit e81f54c6 authored by Rob Herring's avatar Rob Herring Committed by Marc Zyngier
Browse files

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

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Lee Jones <lee@kernel.org>
Cc: Stefan Wahren <stefan.wahren@i2se.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Ray Jui <rjui@broadcom.com>
Cc: Scott Branden <sbranden@broadcom.com>
Cc: bcm-kernel-feedback-list@broadcom.com
Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: "Sören Brinkmann" <soren.brinkmann@xilinx.com>
Cc: linux-rpi-kernel@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mediatek@lists.infradead.org
Cc: linux-tegra@vger.kernel.org
Acked-by: default avatarEric Anholt <eric@anholt.net>
Acked-by: default avatarBaruch Siach <baruch@tkos.co.il>
Acked-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Acked-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Acked-by: default avatarAlexandre Torgue <alexandre.torgue@st.com>
Acked-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 5ed34d3a

drivers/irqchip/irq-bcm2835.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -147,13 +147,12 @@ static int __init armctrl_of_init(struct device_node *node, 




	base = of_iomap(node, 0);

	base = of_iomap(node, 0);

	if (!base)

	if (!base)

		panic("%s: unable to map IC registers\n",

		panic("%pOF: unable to map IC registers\n", node);

			node->full_name);





	intc.domain = irq_domain_add_linear(node, MAKE_HWIRQ(NR_BANKS, 0),

	intc.domain = irq_domain_add_linear(node, MAKE_HWIRQ(NR_BANKS, 0),

			&armctrl_ops, NULL);

			&armctrl_ops, NULL);

	if (!intc.domain)

	if (!intc.domain)

		panic("%s: unable to create IRQ domain\n", node->full_name);

		panic("%pOF: unable to create IRQ domain\n", node);





	for (b = 0; b < NR_BANKS; b++) {

	for (b = 0; b < NR_BANKS; b++) {

		intc.pending[b] = base + reg_pending[b];

		intc.pending[b] = base + reg_pending[b];
@@ -173,8 +172,8 @@ static int __init armctrl_of_init(struct device_node *node, 
		int parent_irq = irq_of_parse_and_map(node, 0);

		int parent_irq = irq_of_parse_and_map(node, 0);





		if (!parent_irq) {

		if (!parent_irq) {

			panic("%s: unable to get parent interrupt.\n",

			panic("%pOF: unable to get parent interrupt.\n",

			      node->full_name);

			      node);

		}

		}

		irq_set_chained_handler(parent_irq, bcm2836_chained_handle_irq);

		irq_set_chained_handler(parent_irq, bcm2836_chained_handle_irq);

	} else {

	} else {

drivers/irqchip/irq-bcm2836.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -282,8 +282,7 @@ static int __init bcm2836_arm_irqchip_l1_intc_of_init(struct device_node *node, 
{

{

	intc.base = of_iomap(node, 0);

	intc.base = of_iomap(node, 0);

	if (!intc.base) {

	if (!intc.base) {

		panic("%s: unable to map local interrupt registers\n",

		panic("%pOF: unable to map local interrupt registers\n", node);

			node->full_name);

	}

	}





	bcm2835_init_local_timer_frequency();

	bcm2835_init_local_timer_frequency();
@@ -292,7 +291,7 @@ static int __init bcm2836_arm_irqchip_l1_intc_of_init(struct device_node *node, 
					    &bcm2836_arm_irqchip_intc_ops,

					    &bcm2836_arm_irqchip_intc_ops,

					    NULL);

					    NULL);

	if (!intc.domain)

	if (!intc.domain)

		panic("%s: unable to create IRQ domain\n", node->full_name);

		panic("%pOF: unable to create IRQ domain\n", node);





	bcm2836_arm_irqchip_register_irq(LOCAL_IRQ_CNTPSIRQ,

	bcm2836_arm_irqchip_register_irq(LOCAL_IRQ_CNTPSIRQ,

					 &bcm2836_arm_irqchip_timer);

					 &bcm2836_arm_irqchip_timer);

drivers/irqchip/irq-crossbar.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -341,13 +341,13 @@ static int __init irqcrossbar_init(struct device_node *node, 
	int err;

	int err;





	if (!parent) {

	if (!parent) {

		pr_err("%s: no parent, giving up\n", node->full_name);

		pr_err("%pOF: no parent, giving up\n", node);

		return -ENODEV;

		return -ENODEV;

	}

	}





	parent_domain = irq_find_host(parent);

	parent_domain = irq_find_host(parent);

	if (!parent_domain) {

	if (!parent_domain) {

		pr_err("%s: unable to obtain parent domain\n", node->full_name);

		pr_err("%pOF: unable to obtain parent domain\n", node);

		return -ENXIO;

		return -ENXIO;

	}

	}
@@ -360,7 +360,7 @@ static int __init irqcrossbar_init(struct device_node *node, 
					  node, &crossbar_domain_ops,

					  node, &crossbar_domain_ops,

					  NULL);

					  NULL);

	if (!domain) {

	if (!domain) {

		pr_err("%s: failed to allocated domain\n", node->full_name);

		pr_err("%pOF: failed to allocated domain\n", node);

		return -ENOMEM;

		return -ENOMEM;

	}

	}

drivers/irqchip/irq-digicolor.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ static int __init digicolor_of_init(struct device_node *node, 




	reg_base = of_iomap(node, 0);

	reg_base = of_iomap(node, 0);

	if (!reg_base) {

	if (!reg_base) {

		pr_err("%s: unable to map IC registers\n", node->full_name);

		pr_err("%pOF: unable to map IC registers\n", node);

		return -ENXIO;

		return -ENXIO;

	}

	}
@@ -88,7 +88,7 @@ static int __init digicolor_of_init(struct device_node *node, 




	ucregs = syscon_regmap_lookup_by_phandle(node, "syscon");

	ucregs = syscon_regmap_lookup_by_phandle(node, "syscon");

	if (IS_ERR(ucregs)) {

	if (IS_ERR(ucregs)) {

		pr_err("%s: unable to map UC registers\n", node->full_name);

		pr_err("%pOF: unable to map UC registers\n", node);

		return PTR_ERR(ucregs);

		return PTR_ERR(ucregs);

	}

	}

	/* channel 1, regular IRQs */

	/* channel 1, regular IRQs */
@@ -97,7 +97,7 @@ static int __init digicolor_of_init(struct device_node *node, 
	digicolor_irq_domain =

	digicolor_irq_domain =

		irq_domain_add_linear(node, 64, &irq_generic_chip_ops, NULL);

		irq_domain_add_linear(node, 64, &irq_generic_chip_ops, NULL);

	if (!digicolor_irq_domain) {

	if (!digicolor_irq_domain) {

		pr_err("%s: unable to create IRQ domain\n", node->full_name);

		pr_err("%pOF: unable to create IRQ domain\n", node);

		return -ENOMEM;

		return -ENOMEM;

	}

	}
@@ -105,7 +105,7 @@ static int __init digicolor_of_init(struct device_node *node, 
					     "digicolor_irq", handle_level_irq,

					     "digicolor_irq", handle_level_irq,

					     clr, 0, 0);

					     clr, 0, 0);

	if (ret) {

	if (ret) {

		pr_err("%s: unable to allocate IRQ gc\n", node->full_name);

		pr_err("%pOF: unable to allocate IRQ gc\n", node);

		return ret;

		return ret;

	}

	}

drivers/irqchip/irq-dw-apb-ictl.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -79,24 +79,24 @@ static int __init dw_apb_ictl_init(struct device_node *np, 
	/* Map the parent interrupt for the chained handler */

	/* Map the parent interrupt for the chained handler */

	irq = irq_of_parse_and_map(np, 0);

	irq = irq_of_parse_and_map(np, 0);

	if (irq <= 0) {

	if (irq <= 0) {

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

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

		return -EINVAL;

		return -EINVAL;

	}

	}





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

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

	if (ret) {

	if (ret) {

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

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

		return ret;

		return ret;

	}

	}





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

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

		pr_err("%s: unable to request mem region\n", np->full_name);

		pr_err("%pOF: unable to request mem region\n", np);

		return -ENOMEM;

		return -ENOMEM;

	}

	}





	iobase = ioremap(r.start, resource_size(&r));

	iobase = ioremap(r.start, resource_size(&r));

	if (!iobase) {

	if (!iobase) {

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

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

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto err_release;

		goto err_release;

	}

	}
@@ -123,7 +123,7 @@ static int __init dw_apb_ictl_init(struct device_node *np, 
	domain = irq_domain_add_linear(np, nrirqs,

	domain = irq_domain_add_linear(np, nrirqs,

				       &irq_generic_chip_ops, NULL);

				       &irq_generic_chip_ops, NULL);

	if (!domain) {

	if (!domain) {

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

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

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto err_unmap;

		goto err_unmap;

	}

	}
@@ -132,7 +132,7 @@ static int __init dw_apb_ictl_init(struct device_node *np, 
					     handle_level_irq, clr, 0,

					     handle_level_irq, clr, 0,

					     IRQ_GC_INIT_MASK_CACHE);

					     IRQ_GC_INIT_MASK_CACHE);

	if (ret) {

	if (ret) {

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

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

		goto err_unmap;

		goto err_unmap;

	}

	}