[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-58bb100a9de10329ca0d63484e76f27c257e9a2e@git.kernel.org>
Date: Thu, 20 Apr 2017 06:13:58 -0700
From: tip-bot for Matt Redfearn <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: matt.redfearn@...tec.com, ralf@...ux-mips.org, mingo@...nel.org,
jason@...edaemon.net, linux-kernel@...r.kernel.org, hpa@...or.com,
daniel.lezcano@...aro.org, tglx@...utronix.de,
paul.burton@...tec.com
Subject: [tip:timers/core] Clocksource/mips-gic: Remove redundant non
devicetree init
Commit-ID: 58bb100a9de10329ca0d63484e76f27c257e9a2e
Gitweb: http://git.kernel.org/tip/58bb100a9de10329ca0d63484e76f27c257e9a2e
Author: Matt Redfearn <matt.redfearn@...tec.com>
AuthorDate: Wed, 19 Apr 2017 13:26:46 +0100
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Thu, 20 Apr 2017 14:56:59 +0200
Clocksource/mips-gic: Remove redundant non devicetree init
Malta was the only platform probing this driver from platform code
without using device tree. With that code removed, gic_clocksource_init
is redundant so remove it.
Signed-off-by: Matt Redfearn <matt.redfearn@...tec.com>
Cc: linux-mips@...ux-mips.org
Cc: Jason Cooper <jason@...edaemon.net>
Cc: Paul Burton <paul.burton@...tec.com>
Cc: Daniel Lezcano <daniel.lezcano@...aro.org>
Cc: Ralf Baechle <ralf@...ux-mips.org>
Link: http://lkml.kernel.org/r/1492604806-23420-2-git-send-email-matt.redfearn@imgtec.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
drivers/clocksource/mips-gic-timer.c | 13 -------------
include/linux/irqchip/mips-gic.h | 1 -
2 files changed, 14 deletions(-)
diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index b6ad9c0..3f52ee2 100644
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -154,19 +154,6 @@ static int __init __gic_clocksource_init(void)
return ret;
}
-void __init gic_clocksource_init(unsigned int frequency)
-{
- gic_frequency = frequency;
- gic_timer_irq = MIPS_GIC_IRQ_BASE +
- GIC_LOCAL_TO_HWIRQ(GIC_LOCAL_INT_COMPARE);
-
- __gic_clocksource_init();
- gic_clockevent_init();
-
- /* And finally start the counter */
- gic_start_count();
-}
-
static int __init gic_clocksource_of_init(struct device_node *node)
{
struct clk *clk;
diff --git a/include/linux/irqchip/mips-gic.h b/include/linux/irqchip/mips-gic.h
index 7b49c71..2b0e566 100644
--- a/include/linux/irqchip/mips-gic.h
+++ b/include/linux/irqchip/mips-gic.h
@@ -258,7 +258,6 @@ extern unsigned int gic_present;
extern void gic_init(unsigned long gic_base_addr,
unsigned long gic_addrspace_size, unsigned int cpu_vec,
unsigned int irqbase);
-extern void gic_clocksource_init(unsigned int);
extern u64 gic_read_count(void);
extern unsigned int gic_get_count_width(void);
extern u64 gic_read_compare(void);
Powered by blists - more mailing lists