* [PATCH] MIPS: BCM63XX: merge bcm63xx_clk.h into bcm63xx/clk.c
@ 2013-04-06 11:31 Jonas Gorski
2013-04-06 15:20 ` Greg Kroah-Hartman
0 siblings, 1 reply; 2+ messages in thread
From: Jonas Gorski @ 2013-04-06 11:31 UTC (permalink / raw)
To: linux-mips, linux-serial
Cc: Ralf Baechle, John Crispin, Maxime Bizon, Florian Fainelli,
Kevin Cernekee, Greg Kroah-Hartman
All the header file does is provide the internal structure of clk,
which shouldn't be used by anyone except clk.c itself anyway.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
---
arch/mips/bcm63xx/clk.c | 8 +++++++-
arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h | 11 -----------
drivers/tty/serial/bcm63xx_uart.c | 1 -
3 files changed, 7 insertions(+), 13 deletions(-)
delete mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h
diff --git a/arch/mips/bcm63xx/clk.c b/arch/mips/bcm63xx/clk.c
index e357d55..6601214 100644
--- a/arch/mips/bcm63xx/clk.c
+++ b/arch/mips/bcm63xx/clk.c
@@ -15,7 +15,13 @@
#include <bcm63xx_io.h>
#include <bcm63xx_regs.h>
#include <bcm63xx_reset.h>
-#include <bcm63xx_clk.h>
+
+struct clk {
+ void (*set)(struct clk *, int);
+ unsigned int rate;
+ unsigned int usage;
+ int id;
+};
static DEFINE_MUTEX(clocks_mutex);
diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h
deleted file mode 100644
index 8fcf8df..0000000
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef BCM63XX_CLK_H_
-#define BCM63XX_CLK_H_
-
-struct clk {
- void (*set)(struct clk *, int);
- unsigned int rate;
- unsigned int usage;
- int id;
-};
-
-#endif /* ! BCM63XX_CLK_H_ */
diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c
index 52a3ecd..6fa2ae7 100644
--- a/drivers/tty/serial/bcm63xx_uart.c
+++ b/drivers/tty/serial/bcm63xx_uart.c
@@ -30,7 +30,6 @@
#include <linux/serial.h>
#include <linux/serial_core.h>
-#include <bcm63xx_clk.h>
#include <bcm63xx_irq.h>
#include <bcm63xx_regs.h>
#include <bcm63xx_io.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] MIPS: BCM63XX: merge bcm63xx_clk.h into bcm63xx/clk.c
2013-04-06 11:31 [PATCH] MIPS: BCM63XX: merge bcm63xx_clk.h into bcm63xx/clk.c Jonas Gorski
@ 2013-04-06 15:20 ` Greg Kroah-Hartman
0 siblings, 0 replies; 2+ messages in thread
From: Greg Kroah-Hartman @ 2013-04-06 15:20 UTC (permalink / raw)
To: Jonas Gorski
Cc: linux-mips, linux-serial, Ralf Baechle, John Crispin,
Maxime Bizon, Florian Fainelli, Kevin Cernekee
On Sat, Apr 06, 2013 at 01:31:02PM +0200, Jonas Gorski wrote:
> All the header file does is provide the internal structure of clk,
> which shouldn't be used by anyone except clk.c itself anyway.
>
> Signed-off-by: Jonas Gorski <jogo@openwrt.org>
> ---
> arch/mips/bcm63xx/clk.c | 8 +++++++-
> arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h | 11 -----------
> drivers/tty/serial/bcm63xx_uart.c | 1 -
> 3 files changed, 7 insertions(+), 13 deletions(-)
> delete mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-06 15:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-06 11:31 [PATCH] MIPS: BCM63XX: merge bcm63xx_clk.h into bcm63xx/clk.c Jonas Gorski
2013-04-06 15:20 ` Greg Kroah-Hartman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).