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

Commit 51e0f004 authored by David S. Miller's avatar David S. Miller
Browse files

sparc64: Fix irq_of_parse_and_map() and irq_dispose_mapping(). 



Stephen Rothwell noticed that I committed an earlier version
of the patch that didn't have two things fixed:

1) irq_of_parse_and_map() should return "unsigned int" not "int"
   and it should return zero for "no irq"

2) irq_dispose_mapping() should be an inline function, not a macro,
   for type checking

With feedback and suggestions from Anton Vorontsov.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 783c98b9

arch/sparc/include/asm/prom.h

+4 −2
Original line number Diff line number Diff line
@@ -101,8 +101,10 @@ static inline void of_node_put(struct device_node *node) 
 * register them in the of_device objects, whereas powerpc computes them

 * on request.

 */

extern int irq_of_parse_and_map(struct device_node *node, int index);

#define irq_dispose_mapping(irq) do { } while (0)

extern unsigned int irq_of_parse_and_map(struct device_node *node, int index);

static inline void irq_dispose_mapping(unsigned int virq)

{

}



/*

 * NB:  This is here while we transition from using asm/prom.h

arch/sparc/kernel/of_device.c

+2 −2
Original line number Diff line number Diff line
@@ -29,12 +29,12 @@ struct of_device *of_find_device_by_node(struct device_node *dp) 
}

EXPORT_SYMBOL(of_find_device_by_node);



int irq_of_parse_and_map(struct device_node *node, int index)

unsigned int irq_of_parse_and_map(struct device_node *node, int index)

{

	struct of_device *op = of_find_device_by_node(node);



	if (!op || index >= op->num_irqs)

		return 0xffffffff;

		return 0;



	return op->irqs[index];

}

arch/sparc64/kernel/of_device.c

+2 −2
Original line number Diff line number Diff line
@@ -55,12 +55,12 @@ struct of_device *of_find_device_by_node(struct device_node *dp) 
}

EXPORT_SYMBOL(of_find_device_by_node);



int irq_of_parse_and_map(struct device_node *node, int index)

unsigned int irq_of_parse_and_map(struct device_node *node, int index)

{

	struct of_device *op = of_find_device_by_node(node);



	if (!op || index >= op->num_irqs)

		return 0xffffffff;

		return 0;



	return op->irqs[index];

}