Skip to content

Commit

Permalink
clocksource/drivers/timer-of: Fix function names
Browse files Browse the repository at this point in the history
All the functions are not prefixed with 'timer_of_', fix the naming in order
to have the code consistent.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1515418139-23276-5-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Daniel Lezcano authored and Ingo Molnar committed Jan 8, 2018
1 parent 542f824 commit 5bbf4ad
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions drivers/clocksource/timer-of.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include "timer-of.h"

static __init void timer_irq_exit(struct of_timer_irq *of_irq)
static __init void timer_of_irq_exit(struct of_timer_irq *of_irq)
{
struct timer_of *to = container_of(of_irq, struct timer_of, of_irq);

Expand All @@ -34,8 +34,8 @@ static __init void timer_irq_exit(struct of_timer_irq *of_irq)
free_irq(of_irq->irq, clkevt);
}

static __init int timer_irq_init(struct device_node *np,
struct of_timer_irq *of_irq)
static __init int timer_of_irq_init(struct device_node *np,
struct of_timer_irq *of_irq)
{
int ret;
struct timer_of *to = container_of(of_irq, struct timer_of, of_irq);
Expand Down Expand Up @@ -72,15 +72,15 @@ static __init int timer_irq_init(struct device_node *np,
return 0;
}

static __init void timer_clk_exit(struct of_timer_clk *of_clk)
static __init void timer_of_clk_exit(struct of_timer_clk *of_clk)
{
of_clk->rate = 0;
clk_disable_unprepare(of_clk->clk);
clk_put(of_clk->clk);
}

static __init int timer_clk_init(struct device_node *np,
struct of_timer_clk *of_clk)
static __init int timer_of_clk_init(struct device_node *np,
struct of_timer_clk *of_clk)
{
int ret;

Expand Down Expand Up @@ -116,13 +116,13 @@ static __init int timer_clk_init(struct device_node *np,
goto out;
}

static __init void timer_base_exit(struct of_timer_base *of_base)
static __init void timer_of_base_exit(struct of_timer_base *of_base)
{
iounmap(of_base->base);
}

static __init int timer_base_init(struct device_node *np,
struct of_timer_base *of_base)
static __init int timer_of_base_init(struct device_node *np,
struct of_timer_base *of_base)
{
const char *name = of_base->name ? of_base->name : np->full_name;

Expand All @@ -141,21 +141,21 @@ int __init timer_of_init(struct device_node *np, struct timer_of *to)
int flags = 0;

if (to->flags & TIMER_OF_BASE) {
ret = timer_base_init(np, &to->of_base);
ret = timer_of_base_init(np, &to->of_base);
if (ret)
goto out_fail;
flags |= TIMER_OF_BASE;
}

if (to->flags & TIMER_OF_CLOCK) {
ret = timer_clk_init(np, &to->of_clk);
ret = timer_of_clk_init(np, &to->of_clk);
if (ret)
goto out_fail;
flags |= TIMER_OF_CLOCK;
}

if (to->flags & TIMER_OF_IRQ) {
ret = timer_irq_init(np, &to->of_irq);
ret = timer_of_irq_init(np, &to->of_irq);
if (ret)
goto out_fail;
flags |= TIMER_OF_IRQ;
Expand All @@ -167,13 +167,13 @@ int __init timer_of_init(struct device_node *np, struct timer_of *to)

out_fail:
if (flags & TIMER_OF_IRQ)
timer_irq_exit(&to->of_irq);
timer_of_irq_exit(&to->of_irq);

if (flags & TIMER_OF_CLOCK)
timer_clk_exit(&to->of_clk);
timer_of_clk_exit(&to->of_clk);

if (flags & TIMER_OF_BASE)
timer_base_exit(&to->of_base);
timer_of_base_exit(&to->of_base);
return ret;
}

Expand All @@ -187,11 +187,11 @@ int __init timer_of_init(struct device_node *np, struct timer_of *to)
void __init timer_of_cleanup(struct timer_of *to)
{
if (to->flags & TIMER_OF_IRQ)
timer_irq_exit(&to->of_irq);
timer_of_irq_exit(&to->of_irq);

if (to->flags & TIMER_OF_CLOCK)
timer_clk_exit(&to->of_clk);
timer_of_clk_exit(&to->of_clk);

if (to->flags & TIMER_OF_BASE)
timer_base_exit(&to->of_base);
timer_of_base_exit(&to->of_base);
}

0 comments on commit 5bbf4ad

Please sign in to comment.