Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S945860AbdDTNRW (ORCPT ); Thu, 20 Apr 2017 09:17:22 -0400 Received: from terminus.zytor.com ([65.50.211.136]:51105 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S945569AbdDTNRQ (ORCPT ); Thu, 20 Apr 2017 09:17:16 -0400 Date: Thu, 20 Apr 2017 06:13:58 -0700 From: tip-bot for Matt Redfearn Message-ID: Cc: matt.redfearn@imgtec.com, ralf@linux-mips.org, mingo@kernel.org, jason@lakedaemon.net, linux-kernel@vger.kernel.org, hpa@zytor.com, daniel.lezcano@linaro.org, tglx@linutronix.de, paul.burton@imgtec.com Reply-To: hpa@zytor.com, linux-kernel@vger.kernel.org, jason@lakedaemon.net, matt.redfearn@imgtec.com, mingo@kernel.org, ralf@linux-mips.org, paul.burton@imgtec.com, daniel.lezcano@linaro.org, tglx@linutronix.de In-Reply-To: <1492604806-23420-2-git-send-email-matt.redfearn@imgtec.com> References: <1492604806-23420-2-git-send-email-matt.redfearn@imgtec.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] Clocksource/mips-gic: Remove redundant non devicetree init Git-Commit-ID: 58bb100a9de10329ca0d63484e76f27c257e9a2e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2308 Lines: 63 Commit-ID: 58bb100a9de10329ca0d63484e76f27c257e9a2e Gitweb: http://git.kernel.org/tip/58bb100a9de10329ca0d63484e76f27c257e9a2e Author: Matt Redfearn AuthorDate: Wed, 19 Apr 2017 13:26:46 +0100 Committer: Thomas Gleixner 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 Cc: linux-mips@linux-mips.org Cc: Jason Cooper Cc: Paul Burton Cc: Daniel Lezcano Cc: Ralf Baechle Link: http://lkml.kernel.org/r/1492604806-23420-2-git-send-email-matt.redfearn@imgtec.com Signed-off-by: Thomas Gleixner --- 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);