aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-04-13 00:49:54 -0400
committerPaul Mundt <lethal@linux-sh.org>2010-04-13 00:49:54 -0400
commit12129fea50edcd696a9556523b058d6c445f21d8 (patch)
tree02242dd533fc1e78fdbda02c894ad23665fbd15d /drivers/sh
parent0ded75428605213641897d6b8d8e9cf9fdb6eb8d (diff)
sh: intc: Tidy up loglevel mismatches.
The printk loglevels are all over the place, make them a bit more coherent, and add some registration notification while we're at it. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/sh')
-rw-r--r--drivers/sh/intc.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/sh/intc.c b/drivers/sh/intc.c
index b605f7e478d6..65e15828faaa 100644
--- a/drivers/sh/intc.c
+++ b/drivers/sh/intc.c
@@ -860,6 +860,9 @@ int __init register_intc_controller(struct intc_desc *desc)
860 struct intc_desc_int *d; 860 struct intc_desc_int *d;
861 struct resource *res; 861 struct resource *res;
862 862
863 pr_info("intc: Registered controller '%s' with %u IRQs\n",
864 desc->name, hw->nr_vectors);
865
863 d = kzalloc(sizeof(*d), GFP_NOWAIT); 866 d = kzalloc(sizeof(*d), GFP_NOWAIT);
864 if (!d) 867 if (!d)
865 goto err0; 868 goto err0;
@@ -974,7 +977,7 @@ int __init register_intc_controller(struct intc_desc *desc)
974 977
975 irq_desc = irq_to_desc_alloc_node(irq, numa_node_id()); 978 irq_desc = irq_to_desc_alloc_node(irq, numa_node_id());
976 if (unlikely(!irq_desc)) { 979 if (unlikely(!irq_desc)) {
977 pr_info("can't get irq_desc for %d\n", irq); 980 pr_err("can't get irq_desc for %d\n", irq);
978 continue; 981 continue;
979 } 982 }
980 983
@@ -994,7 +997,7 @@ int __init register_intc_controller(struct intc_desc *desc)
994 */ 997 */
995 irq_desc = irq_to_desc_alloc_node(irq2, numa_node_id()); 998 irq_desc = irq_to_desc_alloc_node(irq2, numa_node_id());
996 if (unlikely(!irq_desc)) { 999 if (unlikely(!irq_desc)) {
997 pr_info("can't get irq_desc for %d\n", irq2); 1000 pr_err("can't get irq_desc for %d\n", irq2);
998 continue; 1001 continue;
999 } 1002 }
1000 1003
@@ -1121,7 +1124,7 @@ static int __init register_intc_sysdevs(void)
1121 } 1124 }
1122 1125
1123 if (error) 1126 if (error)
1124 pr_warning("intc: sysdev registration error\n"); 1127 pr_err("intc: sysdev registration error\n");
1125 1128
1126 return error; 1129 return error;
1127} 1130}
@@ -1154,7 +1157,7 @@ unsigned int create_irq_nr(unsigned int irq_want, int node)
1154 1157
1155 desc = irq_to_desc_alloc_node(new, node); 1158 desc = irq_to_desc_alloc_node(new, node);
1156 if (unlikely(!desc)) { 1159 if (unlikely(!desc)) {
1157 pr_info("can't get irq_desc for %d\n", new); 1160 pr_err("can't get irq_desc for %d\n", new);
1158 goto out_unlock; 1161 goto out_unlock;
1159 } 1162 }
1160 1163