Skip to content

Commit

Permalink
powerpc: Rework ipic_init() so we can avoid freeing the irq_host
Browse files Browse the repository at this point in the history
If we do the call to of_address_to_resource() first, then we don't
need to worry about freeing the irq_host (which the code doesn't do
currently anyway).

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Michael Ellerman authored and Paul Mackerras committed Jun 9, 2008
1 parent 997526d commit 84f1c1e
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions arch/powerpc/sysdev/ipic.c
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,10 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags)
struct resource res;
u32 temp = 0, ret;

ret = of_address_to_resource(node, 0, &res);
if (ret)
return NULL;

ipic = alloc_bootmem(sizeof(struct ipic));
if (ipic == NULL)
return NULL;
Expand All @@ -739,12 +743,6 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags)
return NULL;
}

ret = of_address_to_resource(node, 0, &res);
if (ret) {
of_node_put(node);
return NULL;
}

ipic->regs = ioremap(res.start, res.end - res.start + 1);

ipic->irqhost->host_data = ipic;
Expand Down

0 comments on commit 84f1c1e

Please sign in to comment.