lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

of/irq: remove references to NO_IRQ in drivers/of/platform.c

Browse Source 
Instead of referencing NO_IRQ in platform.c, define some helper functions
in irq.c to call instead from platform.c.  Keep NO_IRQ usage local to
irq.c, and define NO_IRQ if not defined in headers.

Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Andres Salomon
2010-10-10 21:35:05 -06:00
committed by Grant Likely
parent e2f2a93b63
commit 52f6537cb2
3 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/of/platform.c
View File

@@ -584,14 +584,13 @@ struct platform_device *of_device_alloc(struct device_node *np,
struct device *parent)
{
struct platform_device *dev;
int rc, i, num_reg = 0, num_irq = 0;
int rc, i, num_reg = 0, num_irq;
struct resource *res, temp_res;
/* First count how many resources are needed */
while (of_address_to_resource(np, num_reg, &temp_res) == 0)
num_reg++;
while (of_irq_to_resource(np, num_irq, &temp_res) != NO_IRQ)
num_irq++;
num_irq = of_irq_count(np);
/* Allocate memory for both the struct device and the resource table */
dev = kzalloc(sizeof(*dev) + (sizeof(*res) * (num_reg + num_irq)),
@@ -608,10 +607,7 @@ struct platform_device *of_device_alloc(struct device_node *np,
rc = of_address_to_resource(np, i, res);
WARN_ON(rc);
}
for (i = 0; i < num_irq; i++, res++) {
rc = of_irq_to_resource(np, i, res);
WARN_ON(rc == NO_IRQ);
}
WARN_ON(of_irq_to_resource_table(np, res, num_irq) != num_irq);
}
dev->dev.of_node = of_node_get(np);