Skip to content

Commit

Permalink
[POWERPC] Move of_irq_to_resource from prom.h to prom_parse.c
Browse files Browse the repository at this point in the history
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: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Mathieu Desnoyers authored and Paul Mackerras committed May 2, 2007
1 parent 0eb2e60 commit c0b3ae1
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 13 deletions.
14 changes: 14 additions & 0 deletions arch/powerpc/kernel/prom_parse.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
15 changes: 2 additions & 13 deletions include/asm-powerpc/prom.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit c0b3ae1

Please sign in to comment.