clocksource: Add missing line break to error messages (ac9ce6d1) · Commits · 戴 / test

drivers/clocksource/arc_timer.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ static int noinline arc_get_timer_clk(struct device_node *node)

		clk = of_clk_get(node, 0);
		if (IS_ERR(clk)) {
		pr_err("timer missing clk");
		pr_err("timer missing clk\n");
		return PTR_ERR(clk);
		}

		@@ -89,7 +89,7 @@ static int __init arc_cs_setup_gfrc(struct device_node *node)

		READ_BCR(ARC_REG_MCIP_BCR, mp);
		if (!mp.gfrc) {
		pr_warn("Global-64-bit-Ctr clocksource not detected");
		pr_warn("Global-64-bit-Ctr clocksource not detected\n");
		return -ENXIO;
		}

		@@ -140,13 +140,13 @@ static int __init arc_cs_setup_rtc(struct device_node *node)

		READ_BCR(ARC_REG_TIMERS_BCR, timer);
		if (!timer.rtc) {
		pr_warn("Local-64-bit-Ctr clocksource not detected");
		pr_warn("Local-64-bit-Ctr clocksource not detected\n");
		return -ENXIO;
		}

		/* Local to CPU hence not usable in SMP */
		if (IS_ENABLED(CONFIG_SMP)) {
		pr_warn("Local-64-bit-Ctr not usable in SMP");
		pr_warn("Local-64-bit-Ctr not usable in SMP\n");
		return -EINVAL;
		}

		@@ -290,13 +290,13 @@ static int __init arc_clockevent_setup(struct device_node *node)

		arc_timer_irq = irq_of_parse_and_map(node, 0);
		if (arc_timer_irq <= 0) {
		pr_err("clockevent: missing irq");
		pr_err("clockevent: missing irq\n");
		return -EINVAL;
		}

		ret = arc_get_timer_clk(node);
		if (ret) {
		pr_err("clockevent: missing clk");
		pr_err("clockevent: missing clk\n");
		return ret;
		}

		@@ -313,7 +313,7 @@ static int __init arc_clockevent_setup(struct device_node *node)
		arc_timer_starting_cpu,
		arc_timer_dying_cpu);
		if (ret) {
		pr_err("Failed to setup hotplug state");
		pr_err("Failed to setup hotplug state\n");
		return ret;
		}
		return 0;

drivers/clocksource/arm_arch_timer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1055,7 +1055,7 @@ static int __init arch_timer_mem_init(struct device_node *np)

		ret = -EINVAL;
		if (!irq) {
		pr_err("arch_timer: Frame missing %s irq",
		pr_err("arch_timer: Frame missing %s irq\n",
		arch_timer_mem_use_virtual ? "virt" : "phys");
		goto out;
		}

drivers/clocksource/asm9260_timer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -193,7 +193,7 @@ static int __init asm9260_timer_init(struct device_node *np)

		priv.base = of_io_request_and_map(np, 0, np->name);
		if (IS_ERR(priv.base)) {
		pr_err("%s: unable to map resource", np->name);
		pr_err("%s: unable to map resource\n", np->name);
		return PTR_ERR(priv.base);
		}

drivers/clocksource/bcm2835_timer.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -89,13 +89,13 @@ static int __init bcm2835_timer_init(struct device_node *node)

		base = of_iomap(node, 0);
		if (!base) {
		pr_err("Can't remap registers");
		pr_err("Can't remap registers\n");
		return -ENXIO;
		}

		ret = of_property_read_u32(node, "clock-frequency", &freq);
		if (ret) {
		pr_err("Can't read clock-frequency");
		pr_err("Can't read clock-frequency\n");
		goto err_iounmap;
		}

		@@ -107,7 +107,7 @@ static int __init bcm2835_timer_init(struct device_node *node)

		irq = irq_of_parse_and_map(node, DEFAULT_TIMER);
		if (irq <= 0) {
		pr_err("Can't parse IRQ");
		pr_err("Can't parse IRQ\n");
		ret = -EINVAL;
		goto err_iounmap;
		}

drivers/clocksource/bcm_kona_timer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -179,7 +179,7 @@ static int __init kona_timer_init(struct device_node *node)
		} else if (!of_property_read_u32(node, "clock-frequency", &freq)) {
		arch_timer_rate = freq;
		} else {
		pr_err("Kona Timer v1 unable to determine clock-frequency");
		pr_err("Kona Timer v1 unable to determine clock-frequency\n");
		return -EINVAL;
		}

Admin message