Skip to contentSkip to conversation

Remove sysdev/commproc.h

PATCH Superseded Jochen Friedrich 2 participants 3 messages Jan 23, 2008

Subsystems (3)
Network drivers PowerPC Linux for PowerPC embedded PPC8XX and PPC83XX

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Jochen Friedrich

author
#0 lore raw

PATCH v2 5/8 Remove sysdev/commproc.h

Move cpm1 specific prototypes to asm/commproc.h and mpc8xx specific prototypes to asm/mpc8xx.h. Adjust includes accordingly. Remove now unneeded sysdev/commproc.h.

Signed-off-by Jochen Friedrich <[email protected]>
---
 arch/powerpc/platforms/8xx/ep88xc.c          |    3 +--
 arch/powerpc/platforms/8xx/m8xx_setup.c      |    1 -
 arch/powerpc/platforms/8xx/mpc86xads_setup.c |    2 --
 arch/powerpc/platforms/8xx/mpc885ads_setup.c |    2 --
 arch/powerpc/sysdev/commproc.c               |    1 -
 arch/powerpc/sysdev/commproc.h               |   12 ------------
 arch/powerpc/sysdev/mpc8xx_pic.c             |    1 -
 drivers/net/fs_enet/mac-scc.c                |    1 -
 include/asm-powerpc/commproc.h               |    2 ++
 include/asm-powerpc/mpc8xx.h                 |    7 +++++++
 10 files changed, 10 insertions(+), 22 deletions(-)
 delete mode 100644 arch/powerpc/sysdev/commproc.h
arch/powerpc/platforms/8xx/ep88xc.c +1 -2
index c883c31..9365f07 100644
@@ -16,8 +16,7 @@
 #include <asm/io.h>
 #include <asm/udbg.h>
 #include <asm/commproc.h>
-
-#include <sysdev/commproc.h>
+#include <asm/mpc8xx.h>
 
 struct cpm_pin {
 	int port, pin, flags;
arch/powerpc/platforms/8xx/m8xx_setup.c +0 -1
index 85abd61..c6a4663 100644
@@ -25,7 +25,6 @@
 #include <mm/mmu_decl.h>
 
 #include <sysdev/mpc8xx_pic.h>
-#include <sysdev/commproc.h>
 
 #ifdef CONFIG_PCMCIA_M8XX
 struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops;
arch/powerpc/platforms/8xx/mpc86xads_setup.c +0 -2
index dea1df1..7389590 100644
@@ -27,8 +27,6 @@
 #include <asm/fs_pd.h>
 #include <asm/udbg.h>
 
-#include <sysdev/commproc.h>
-
 #include "mpc86xads.h"
 
 struct cpm_pin {
arch/powerpc/platforms/8xx/mpc885ads_setup.c +0 -2
index 8f2aa04..ae69e93 100644
@@ -40,8 +40,6 @@
 #include <asm/fs_pd.h>
 #include <asm/udbg.h>
 
-#include <sysdev/commproc.h>
-
 static u32 __iomem *bcsr, *bcsr5;
 
 #ifdef CONFIG_PCMCIA_M8XX
arch/powerpc/sysdev/commproc.c +0 -1
index 818d4b0..ef82587 100644
@@ -30,7 +30,6 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/module.h>
-#include <asm/mpc8xx.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/8xx_immap.h>
arch/powerpc/sysdev/commproc.h deleted +0 -12
deleted file mode 100644
index f481adf..0000000
@@ -1,12 +0,0 @@
-#ifndef _POWERPC_SYSDEV_COMMPROC_H
-#define _POWERPC_SYSDEV_COMMPROC_H
-
-extern void cpm_reset(void);
-extern void mpc8xx_restart(char *cmd);
-extern void mpc8xx_calibrate_decr(void);
-extern int mpc8xx_set_rtc_time(struct rtc_time *tm);
-extern void mpc8xx_get_rtc_time(struct rtc_time *tm);
-extern void mpc8xx_pics_init(void);
-extern unsigned int mpc8xx_get_irq(void);
-
-#endif
arch/powerpc/sysdev/mpc8xx_pic.c +0 -1
index 7aa4ff5..0e74a4b 100644
@@ -10,7 +10,6 @@
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/8xx_immap.h>
-#include <asm/mpc8xx.h>
 
 #include "mpc8xx_pic.h"
drivers/net/fs_enet/mac-scc.c +0 -1
index fe3d8a6..1502dbf 100644
@@ -39,7 +39,6 @@
 #ifdef CONFIG_8xx
 #include <asm/8xx_immap.h>
 #include <asm/pgtable.h>
-#include <asm/mpc8xx.h>
 #include <asm/commproc.h>
 #endif
include/asm-powerpc/commproc.h +2 -0
index 9757521..ec87b8f 100644
@@ -89,6 +89,8 @@ extern void cpm_setbrg(uint brg, uint rate);
 
 extern void cpm_load_patch(cpm8xx_t *cp);
 
+extern void cpm_reset(void);
+
 /* Buffer descriptors used by many of the CPM protocols.
 */
 typedef struct cpm_buf_desc {
include/asm-powerpc/mpc8xx.h +7 -0
index 2be014b..2af9fcb 100644
@@ -11,6 +11,13 @@
 
 #ifdef CONFIG_8xx
 
+extern void mpc8xx_restart(char *cmd);
+extern void mpc8xx_calibrate_decr(void);
+extern int mpc8xx_set_rtc_time(struct rtc_time *tm);
+extern void mpc8xx_get_rtc_time(struct rtc_time *tm);
+extern void mpc8xx_pics_init(void);
+extern unsigned int mpc8xx_get_irq(void);
+
 #ifdef CONFIG_FADS
 #include <platforms/fads.h>
 #endif
Signature · 1 line
1.5.3.8
#1 lore raw
Quoted 6 lines · Jochen Friedrich

Move cpm1 specific prototypes to asm/commproc.h and mpc8xx specific prototypes to asm/mpc8xx.h. Adjust includes accordingly. Remove now unneeded sysdev/commproc.h.

Signed-off-by Jochen Friedrich <[email protected]>

---

Quoted 10 lines
arch/powerpc/platforms/8xx/ep88xc.c          |    3 +--
arch/powerpc/platforms/8xx/m8xx_setup.c      |    1 -
arch/powerpc/platforms/8xx/mpc86xads_setup.c |    2 --
arch/powerpc/platforms/8xx/mpc885ads_setup.c |    2 --
arch/powerpc/sysdev/commproc.c               |    1 -
arch/powerpc/sysdev/commproc.h               |   12 ------------
arch/powerpc/sysdev/mpc8xx_pic.c             |    1 -
drivers/net/fs_enet/mac-scc.c                |    1 -
include/asm-powerpc/commproc.h               |    2 ++
include/asm-powerpc/mpc8xx.h                 |    7 +++++++

Do we really need the prototypes you moved into asm/mpc8xx.h here? can they just live in platforms/8xx/8xx.h or something like that?

- k

author
#2 lore raw

Hi Kumar,

Quoted 1 line

Do we really need the prototypes you moved into asm/mpc8xx.h here? can they just live in platforms/8xx/8xx.h or something like that?

At least drivers/pcmcia/m8xx_pcmcia.c uses the symbol m8xx_pcmcia_ops which is conditionally defined in platforms/8xx/m8xx_setup.c. However, this driver currently seems to be broken (doesn't compile neither as built-in nor as module).

Other drivers that include asm/mpc8xx.c are:

drivers/net/fec.c (the include seems to be obsolete, as according to Kconfig
the driver is only built on MPC52xx platforms)
drivers/net/fec_8xx (unused, depends on non-existant CONFIG_8XX) drivers/net/fs_enet (i need to check if the include is needed, at all)

I'll have a closer look at this.

Thanks,
Jochen