diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-06-02 05:10:00 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-06-02 05:10:00 -0400 |
commit | ac422f9443191e050c16fe99baeb5c3d74934589 (patch) | |
tree | 186b82a4892fa0a534ea18ee7fbba02045bf7608 /drivers/sh/intc.c | |
parent | 560526f1617acca62b645c81fb43923954d4ddc5 (diff) |
sh: Make intc messages consistent via pr_fmt.
Wrapping pr_fmt to the KBUILD_MODNAME prefix seems to be the trendy
thing to do these days, so just do that instead of manually tidying
up the stragglers.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/sh/intc.c')
-rw-r--r-- | drivers/sh/intc.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/sh/intc.c b/drivers/sh/intc.c index c585574b9ae..e91a23e5ffd 100644 --- a/drivers/sh/intc.c +++ b/drivers/sh/intc.c | |||
@@ -16,6 +16,8 @@ | |||
16 | * License. See the file "COPYING" in the main directory of this archive | 16 | * License. See the file "COPYING" in the main directory of this archive |
17 | * for more details. | 17 | * for more details. |
18 | */ | 18 | */ |
19 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
20 | |||
19 | #include <linux/init.h> | 21 | #include <linux/init.h> |
20 | #include <linux/irq.h> | 22 | #include <linux/irq.h> |
21 | #include <linux/module.h> | 23 | #include <linux/module.h> |
@@ -855,8 +857,8 @@ static void __init intc_register_irq(struct intc_desc *desc, | |||
855 | primary = 1; | 857 | primary = 1; |
856 | 858 | ||
857 | if (!data[0] && !data[1]) | 859 | if (!data[0] && !data[1]) |
858 | pr_warning("intc: missing unique irq mask for " | 860 | pr_warning("missing unique irq mask for irq %d (vect 0x%04x)\n", |
859 | "irq %d (vect 0x%04x)\n", irq, irq2evt(irq)); | 861 | irq, irq2evt(irq)); |
860 | 862 | ||
861 | data[0] = data[0] ? data[0] : intc_mask_data(desc, d, enum_id, 1); | 863 | data[0] = data[0] ? data[0] : intc_mask_data(desc, d, enum_id, 1); |
862 | data[1] = data[1] ? data[1] : intc_prio_data(desc, d, enum_id, 1); | 864 | data[1] = data[1] ? data[1] : intc_prio_data(desc, d, enum_id, 1); |
@@ -952,7 +954,7 @@ int __init register_intc_controller(struct intc_desc *desc) | |||
952 | struct intc_desc_int *d; | 954 | struct intc_desc_int *d; |
953 | struct resource *res; | 955 | struct resource *res; |
954 | 956 | ||
955 | pr_info("intc: Registered controller '%s' with %u IRQs\n", | 957 | pr_info("Registered controller '%s' with %u IRQs\n", |
956 | desc->name, hw->nr_vectors); | 958 | desc->name, hw->nr_vectors); |
957 | 959 | ||
958 | d = kzalloc(sizeof(*d), GFP_NOWAIT); | 960 | d = kzalloc(sizeof(*d), GFP_NOWAIT); |
@@ -1148,7 +1150,7 @@ int register_intc_userimask(unsigned long addr) | |||
1148 | if (unlikely(!uimask)) | 1150 | if (unlikely(!uimask)) |
1149 | return -ENOMEM; | 1151 | return -ENOMEM; |
1150 | 1152 | ||
1151 | pr_info("intc: userimask support registered for levels 0 -> %d\n", | 1153 | pr_info("userimask support registered for levels 0 -> %d\n", |
1152 | default_prio_level - 1); | 1154 | default_prio_level - 1); |
1153 | 1155 | ||
1154 | return 0; | 1156 | return 0; |
@@ -1286,7 +1288,7 @@ static int __init register_intc_sysdevs(void) | |||
1286 | } | 1288 | } |
1287 | 1289 | ||
1288 | if (error) | 1290 | if (error) |
1289 | pr_err("intc: sysdev registration error\n"); | 1291 | pr_err("sysdev registration error\n"); |
1290 | 1292 | ||
1291 | return error; | 1293 | return error; |
1292 | } | 1294 | } |