Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 191613
b: refs/heads/master
c: 12129fe
h: refs/heads/master
i:
  191611: d2adef5
v: v3
  • Loading branch information
Paul Mundt committed Apr 13, 2010
1 parent c29da48 commit f32de4c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0ded75428605213641897d6b8d8e9cf9fdb6eb8d
refs/heads/master: 12129fea50edcd696a9556523b058d6c445f21d8
11 changes: 7 additions & 4 deletions trunk/drivers/sh/intc.c
Original file line number Diff line number Diff line change
Expand Up @@ -860,6 +860,9 @@ int __init register_intc_controller(struct intc_desc *desc)
struct intc_desc_int *d;
struct resource *res;

pr_info("intc: Registered controller '%s' with %u IRQs\n",
desc->name, hw->nr_vectors);

d = kzalloc(sizeof(*d), GFP_NOWAIT);
if (!d)
goto err0;
Expand Down Expand Up @@ -974,7 +977,7 @@ int __init register_intc_controller(struct intc_desc *desc)

irq_desc = irq_to_desc_alloc_node(irq, numa_node_id());
if (unlikely(!irq_desc)) {
pr_info("can't get irq_desc for %d\n", irq);
pr_err("can't get irq_desc for %d\n", irq);
continue;
}

Expand All @@ -994,7 +997,7 @@ int __init register_intc_controller(struct intc_desc *desc)
*/
irq_desc = irq_to_desc_alloc_node(irq2, numa_node_id());
if (unlikely(!irq_desc)) {
pr_info("can't get irq_desc for %d\n", irq2);
pr_err("can't get irq_desc for %d\n", irq2);
continue;
}

Expand Down Expand Up @@ -1121,7 +1124,7 @@ static int __init register_intc_sysdevs(void)
}

if (error)
pr_warning("intc: sysdev registration error\n");
pr_err("intc: sysdev registration error\n");

return error;
}
Expand Down Expand Up @@ -1154,7 +1157,7 @@ unsigned int create_irq_nr(unsigned int irq_want, int node)

desc = irq_to_desc_alloc_node(new, node);
if (unlikely(!desc)) {
pr_info("can't get irq_desc for %d\n", new);
pr_err("can't get irq_desc for %d\n", new);
goto out_unlock;
}

Expand Down

0 comments on commit f32de4c

Please sign in to comment.