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

Commit 48a9b733 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Grant Likely
Browse files

of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh 



Now CONFIG_OF can be enabled on sh:

    drivers/of/irq.c:472:8: error: redefinition of 'struct intc_desc'
    include/linux/sh_intc.h:109:8: note: originally defined here

As "intc_desc" is used all over the place in sh platform code, while
drivers/of/irq.c has a local definition used in a single function,
rename the latter by prefixing it with "of_".

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarGrant Likely <grant.likely@linaro.org>
parent d23b2516

drivers/of/irq.c

+3 −3
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ int of_irq_to_resource_table(struct device_node *dev, struct resource *res, 
}

EXPORT_SYMBOL_GPL(of_irq_to_resource_table);



struct intc_desc {

struct of_intc_desc {

	struct list_head	list;

	struct device_node	*dev;

	struct device_node	*interrupt_parent;
@@ -484,7 +484,7 @@ struct intc_desc { 
void __init of_irq_init(const struct of_device_id *matches)

{

	struct device_node *np, *parent = NULL;

	struct intc_desc *desc, *temp_desc;

	struct of_intc_desc *desc, *temp_desc;

	struct list_head intc_desc_list, intc_parent_list;



	INIT_LIST_HEAD(&intc_desc_list);
@@ -495,7 +495,7 @@ void __init of_irq_init(const struct of_device_id *matches) 
				!of_device_is_available(np))

			continue;

		/*

		 * Here, we allocate and populate an intc_desc with the node

		 * Here, we allocate and populate an of_intc_desc with the node

		 * pointer, interrupt-parent device_node etc.

		 */

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