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

Commit 66a91e9c authored by Andy Fleming's avatar Andy Fleming Committed by Paul Mackerras
Browse files

[PATCH] of_irq_to_resource now returns the virq 



Mostly this is to allow for error checking (check the return for NO_IRQ)
Added a check that the resource is non-NULL, too.

Signed-off-by: default avatarAndrew Fleming <afleming@freescale.com>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent a9b14973

include/asm-powerpc/prom.h

+11 −3
Original line number Original line Diff line number Diff line
@@ -332,12 +332,20 @@ extern int of_irq_map_one(struct device_node *device, int index, 
struct pci_dev;

struct pci_dev;

extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq);

extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq);





static inline void of_irq_to_resource(struct device_node *dev, int index, struct resource *r)

static inline int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)

{

{

	r->start = r->end = irq_of_parse_and_map(dev, index);

	int irq = irq_of_parse_and_map(dev, index);



	/* Only dereference the resource if both the

	 * resource and the irq are valid. */

	if (r && irq != NO_IRQ) {

		r->start = r->end = irq;

		r->flags = IORESOURCE_IRQ;

		r->flags = IORESOURCE_IRQ;

	}

	}





	return irq;

}







#endif /* __KERNEL__ */

#endif /* __KERNEL__ */

#endif /* _POWERPC_PROM_H */
 
#endif /* _POWERPC_PROM_H */