2019-06-11 18:08:49

by Paul Cercueil

Subject: [PATCH v2 5/5] MIPS: Remove dead code

Remove the unused <asm/mach-jz4740/clock.h> include.

Signed-off-by: Paul Cercueil <[email protected]>
---

Notes:
v2: Rebase on v5.2-rc4

arch/mips/include/asm/mach-jz4740/clock.h | 22 ----------------------
arch/mips/jz4740/board-qi_lb60.c | 2 --
arch/mips/jz4740/platform.c | 2 --
arch/mips/jz4740/time.c | 3 ---
4 files changed, 29 deletions(-)
delete mode 100644 arch/mips/include/asm/mach-jz4740/clock.h

diff --git a/arch/mips/include/asm/mach-jz4740/clock.h b/arch/mips/include/asm/mach-jz4740/clock.h
deleted file mode 100644
index 600d5051691a..000000000000
--- a/arch/mips/include/asm/mach-jz4740/clock.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (C) 2010, Lars-Peter Clausen <[email protected]>
- */
-
-#ifndef __ASM_JZ4740_CLOCK_H__
-#define __ASM_JZ4740_CLOCK_H__
-
-enum jz4740_wait_mode {
- JZ4740_WAIT_MODE_IDLE,
- JZ4740_WAIT_MODE_SLEEP,
-};
-
-void jz4740_clock_set_wait_mode(enum jz4740_wait_mode mode);
-
-void jz4740_clock_suspend(void);
-void jz4740_clock_resume(void);
-
-void jz4740_clock_udc_enable_auto_suspend(void);
-void jz4740_clock_udc_disable_auto_suspend(void);
-
-#endif
diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c
index 071e9d94eea7..d07ee418e5b0 100644
--- a/arch/mips/jz4740/board-qi_lb60.c
+++ b/arch/mips/jz4740/board-qi_lb60.c
@@ -37,8 +37,6 @@

#include <asm/mach-jz4740/platform.h>

-#include "clock.h"
-
/* GPIOs */
#define QI_LB60_GPIO_KEYOUT(x) (JZ_GPIO_PORTC(10) + (x))
#define QI_LB60_GPIO_KEYIN(x) (JZ_GPIO_PORTD(18) + (x))
diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c
index 4b89abb17950..c74c99f5951d 100644
--- a/arch/mips/jz4740/platform.c
+++ b/arch/mips/jz4740/platform.c
@@ -21,8 +21,6 @@
#include <linux/serial_core.h>
#include <linux/serial_8250.h>

-#include "clock.h"
-
/* USB Device Controller */
struct platform_device jz4740_udc_xceiv_device = {
.name = "usb_phy_generic",
diff --git a/arch/mips/jz4740/time.c b/arch/mips/jz4740/time.c
index a3260c754e65..cb768e560d8b 100644
--- a/arch/mips/jz4740/time.c
+++ b/arch/mips/jz4740/time.c
@@ -13,13 +13,10 @@
#include <linux/clockchips.h>
#include <linux/sched_clock.h>

-#include <asm/mach-jz4740/clock.h>
#include <asm/mach-jz4740/irq.h>
#include <asm/mach-jz4740/timer.h>
#include <asm/time.h>

-#include "clock.h"
-
#define TIMER_CLOCKEVENT 0
#define TIMER_CLOCKSOURCE 1

--
2.21.0.593.g511ec345e18

2019-06-12 06:44:56

by Paul Burton

Subject: Re: [PATCH v2 5/5] MIPS: Remove dead code

Hi Paul,

On Tue, Jun 11, 2019 at 08:07:57PM +0200, Paul Cercueil wrote:
> Remove the unused <asm/mach-jz4740/clock.h> include.
>
> Signed-off-by: Paul Cercueil <[email protected]>

Presuming this goes via the clk tree:

Acked-by: Paul Burton <[email protected]>

Thanks,
Paul

2019-06-25 22:49:33

by Stephen Boyd

Subject: Re: [PATCH v2 5/5] MIPS: Remove dead code

Quoting Paul Cercueil (2019-06-11 11:07:57)
> Remove the unused <asm/mach-jz4740/clock.h> include.
>
> Signed-off-by: Paul Cercueil <[email protected]>
> ---

Applied to clk-next