clocksource/drivers/mips-gic-timer: Add pr_fmt and reword pr_* messages
Several messages from the MIPS GIC driver include the text "GIC", "GIC timer", etc, but the format is not standard. Add a pr_fmt of "mips-gic-timer: " and reword the messages now that they will be prefixed with the driver name. Signed-off-by: Matt Redfearn <matt.redfearn@mips.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
This commit is contained in:
parent
8a1ece26d3
commit
3ca5768de8
|
@ -5,6 +5,9 @@
|
|||
*
|
||||
* Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) "mips-gic-timer: " fmt
|
||||
|
||||
#include <linux/clk.h>
|
||||
#include <linux/clockchips.h>
|
||||
#include <linux/cpu.h>
|
||||
|
@ -136,8 +139,7 @@ static int gic_clockevent_init(void)
|
|||
|
||||
ret = setup_percpu_irq(gic_timer_irq, &gic_compare_irqaction);
|
||||
if (ret < 0) {
|
||||
pr_err("GIC timer IRQ %d setup failed: %d\n",
|
||||
gic_timer_irq, ret);
|
||||
pr_err("IRQ %d setup failed (%d)\n", gic_timer_irq, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -176,7 +178,7 @@ static int __init __gic_clocksource_init(void)
|
|||
|
||||
ret = clocksource_register_hz(&gic_clocksource, gic_frequency);
|
||||
if (ret < 0)
|
||||
pr_warn("GIC: Unable to register clocksource\n");
|
||||
pr_warn("Unable to register clocksource\n");
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
@ -188,7 +190,7 @@ static int __init gic_clocksource_of_init(struct device_node *node)
|
|||
|
||||
if (!mips_gic_present() || !node->parent ||
|
||||
!of_device_is_compatible(node->parent, "mti,gic")) {
|
||||
pr_warn("No DT definition for the mips gic driver\n");
|
||||
pr_warn("No DT definition\n");
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
|
@ -196,7 +198,7 @@ static int __init gic_clocksource_of_init(struct device_node *node)
|
|||
if (!IS_ERR(clk)) {
|
||||
ret = clk_prepare_enable(clk);
|
||||
if (ret < 0) {
|
||||
pr_err("GIC failed to enable clock\n");
|
||||
pr_err("Failed to enable clock\n");
|
||||
clk_put(clk);
|
||||
return ret;
|
||||
}
|
||||
|
@ -204,12 +206,12 @@ static int __init gic_clocksource_of_init(struct device_node *node)
|
|||
gic_frequency = clk_get_rate(clk);
|
||||
} else if (of_property_read_u32(node, "clock-frequency",
|
||||
&gic_frequency)) {
|
||||
pr_err("GIC frequency not specified.\n");
|
||||
pr_err("Frequency not specified\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
gic_timer_irq = irq_of_parse_and_map(node, 0);
|
||||
if (!gic_timer_irq) {
|
||||
pr_err("GIC timer IRQ not specified.\n");
|
||||
pr_err("IRQ not specified\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -220,7 +222,7 @@ static int __init gic_clocksource_of_init(struct device_node *node)
|
|||
ret = gic_clockevent_init();
|
||||
if (!ret && !IS_ERR(clk)) {
|
||||
if (clk_notifier_register(clk, &gic_clk_nb) < 0)
|
||||
pr_warn("GIC: Unable to register clock notifier\n");
|
||||
pr_warn("Unable to register clock notifier\n");
|
||||
}
|
||||
|
||||
/* And finally start the counter */
|
||||
|
|
Loading…
Reference in a new issue