clocksource/drivers/sp804: Delete the leading "__" of some functions (975434f8) · Commits · 戴 / test

drivers/clocksource/timer-sp804.c

+15 −12

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ static u64 notrace sp804_read(void)
		return ~readl_relaxed(sched_clock_base + TIMER_VALUE);
		}

		int __init __sp804_clocksource_and_sched_clock_init(void __iomem *base,
		int __init sp804_clocksource_and_sched_clock_init(void __iomem *base,
		const char *name,
		struct clk *clk,
		int use_sched_clock)
		@@ -159,7 +159,8 @@ static struct clock_event_device sp804_clockevent = {
		.rating = 300,
		};

		int __init __sp804_clockevents_init(void __iomem base, unsigned int irq, struct clk clk, const char *name)
		int __init sp804_clockevents_init(void __iomem *base, unsigned int irq,
		struct clk clk, const char name)
		{
		struct clock_event_device *evt = &sp804_clockevent;
		long rate;
		@@ -228,20 +229,21 @@ static int __init sp804_of_init(struct device_node *np)
		of_property_read_u32(np, "arm,sp804-has-irq", &irq_num);
		if (irq_num == 2) {

		ret = __sp804_clockevents_init(base + TIMER_2_BASE, irq, clk2, name);
		ret = sp804_clockevents_init(base + TIMER_2_BASE, irq, clk2, name);
		if (ret)
		goto err;

		ret = __sp804_clocksource_and_sched_clock_init(base, name, clk1, 1);
		ret = sp804_clocksource_and_sched_clock_init(base,
		name, clk1, 1);
		if (ret)
		goto err;
		} else {

		ret = __sp804_clockevents_init(base, irq, clk1 , name);
		ret = sp804_clockevents_init(base, irq, clk1, name);
		if (ret)
		goto err;

		ret =__sp804_clocksource_and_sched_clock_init(base + TIMER_2_BASE,
		ret = sp804_clocksource_and_sched_clock_init(base + TIMER_2_BASE,
		name, clk2, 1);
		if (ret)
		goto err;
		@@ -282,7 +284,8 @@ static int __init integrator_cp_of_init(struct device_node *np)
		goto err;

		if (!init_count) {
		ret = __sp804_clocksource_and_sched_clock_init(base, name, clk, 0);
		ret = sp804_clocksource_and_sched_clock_init(base,
		name, clk, 0);
		if (ret)
		goto err;
		} else {
		@@ -290,7 +293,7 @@ static int __init integrator_cp_of_init(struct device_node *np)
		if (irq <= 0)
		goto err;

		ret = __sp804_clockevents_init(base, irq, clk, name);
		ret = sp804_clockevents_init(base, irq, clk, name);
		if (ret)
		goto err;
		}

Admin message