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

Commit 84f1c1e0 authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

powerpc: Rework ipic_init() so we can avoid freeing the irq_host 



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: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 997526db

arch/powerpc/sysdev/ipic.c

+4 −6
Original line number Diff line number Diff line
@@ -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;
@@ -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;