Commit c0b3ae14 authored by Mathieu Desnoyers's avatar Mathieu Desnoyers Committed by Paul Mackerras
Browse files

[POWERPC] Move of_irq_to_resource from prom.h to prom_parse.c 



In the powerpc architecture, of_irq_to_resource, currently sitting in
prom.h, needs irq_of_parse_and_map and NO_IRQ from asm-powerpc/irq.h.
The solution suggested by Benjamin Herrenschmidt is to move it to
arch/powerpc/kernel/prom_parse.c.

Signed-off-by: default avatarMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 0eb2e601

arch/powerpc/kernel/prom_parse.c

+14 −0
Original line number Diff line number Diff line
@@ -1042,3 +1042,17 @@ const void *of_get_mac_address(struct device_node *np) 
}

EXPORT_SYMBOL(of_get_mac_address);



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

{

	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;

	}



	return irq;

}

EXPORT_SYMBOL_GPL(of_irq_to_resource);

include/asm-powerpc/prom.h

+2 −13
Original line number Diff line number Diff line
@@ -334,19 +334,8 @@ extern int of_irq_map_one(struct device_node *device, int index, 
struct pci_dev;

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



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

{

	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;

	}



	return irq;

}

extern int of_irq_to_resource(struct device_node *dev, int index,

			struct resource *r);



static inline void __iomem *of_iomap(struct device_node *np, int index)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE