lkml.org 
[lkml]   [2020]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: timers/core] clocksource/drivers/sp804: Delete the leading "__" of some functions
    The following commit has been merged into the timers/core branch of tip:

    Commit-ID: 975434f8b24a55af31daa4634972890c061a0a0c
    Gitweb: https://git.kernel.org/tip/975434f8b24a55af31daa4634972890c061a0a0c
    Author: Zhen Lei <thunder.leizhen@huawei.com>
    AuthorDate: Fri, 18 Sep 2020 21:22:31 +08:00
    Committer: Daniel Lezcano <daniel.lezcano@linaro.org>
    CommitterDate: Thu, 24 Sep 2020 10:51:04 +02:00

    clocksource/drivers/sp804: Delete the leading "__" of some functions

    Delete the leading "__" of __sp804_clocksource_and_sched_clock_init() and
    __sp804_clockevents_init(), make it looks a little more comfortable.

    Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
    Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
    Link: https://lore.kernel.org/r/20200918132237.3552-4-thunder.leizhen@huawei.com
    ---
    drivers/clocksource/timer-sp804.c | 27 +++++++++++++++------------
    1 file changed, 15 insertions(+), 12 deletions(-)

    diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c
    index 97b41a4..097f5a8 100644
    --- a/drivers/clocksource/timer-sp804.c
    +++ b/drivers/clocksource/timer-sp804.c
    @@ -65,10 +65,10 @@ 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,
    - const char *name,
    - struct clk *clk,
    - int use_sched_clock)
    +int __init sp804_clocksource_and_sched_clock_init(void __iomem *base,
    + const char *name,
    + struct clk *clk,
    + int use_sched_clock)
    {
    long rate;

    @@ -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,21 +229,22 @@ 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,
    - name, clk2, 1);
    + 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;
    }
    \
     
     \ /
      Last update: 2020-09-27 11:27    [W:4.123 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site