Re: [PATCHv2 7/8] [POWERPC] Rename commproc to cpm1 and cpm2_common.c to cpm2.c

[Stephen Rothwell]

Hi Jochen,

On Wed, 23 Jan 2008 17:01:57 +0100 Jochen Friedrich <[EMAIL PROTECTED]> wrote:
>
> +++ b/arch/powerpc/platforms/8xx/ep88xc.c
> @@ -15,7 +15,7 @@
>   #include 
>   #include 
>   #include 
> -#include 
> +#include 
>   #include 

Something has whitespace damaged this patch.

-- 
Cheers,
Stephen Rothwell[EMAIL PROTECTED]
http://www.canb.auug.org.au/~sfr/


pgpCgUOq3CO1v.pgp
Description: PGP signature

[PATCHv2 7/8] [POWERPC] Rename commproc to cpm1 and cpm2_common.c to cpm2.c

[Jochen Friedrich]

Rename commproc.[ch] to cpm1.[ch] to be more consistent with cpm2. Also
rename cpm2_common.c to cpm2.c as suggested by Scott Wood. Adjust the
includes accordingly.

Signed-off-by: Jochen Friedrich <[EMAIL PROTECTED]>
---
 arch/powerpc/platforms/8xx/ep88xc.c   |2 +-
 arch/powerpc/platforms/8xx/mpc86xads_setup.c  |2 +-
 arch/powerpc/platforms/8xx/mpc885ads_setup.c  |2 +-
 arch/powerpc/sysdev/Makefile  |4 ++--
 arch/powerpc/sysdev/{commproc.c => cpm1.c}|4 ++--
 arch/powerpc/sysdev/{cpm2_common.c => cpm2.c} |3 +--
 arch/powerpc/sysdev/micropatch.c  |2 +-
 arch/ppc/8260_io/enet.c   |2 +-
 arch/ppc/8xx_io/commproc.c|2 +-
 arch/ppc/8xx_io/enet.c|6 +++---
 arch/ppc/8xx_io/fec.c |2 +-
 arch/ppc/8xx_io/micropatch.c  |2 +-
 arch/ppc/boot/simple/iic.c|2 +-
 arch/ppc/boot/simple/m8xx_tty.c   |2 +-
 arch/ppc/kernel/ppc_ksyms.c   |2 +-
 arch/ppc/platforms/mpc866ads_setup.c  |2 +-
 arch/ppc/platforms/mpc885ads_setup.c  |2 +-
 arch/ppc/syslib/mpc8xx_devices.c  |2 +-
 arch/ppc/xmon/start_8xx.c |2 +-
 drivers/net/fec.c |2 +-
 drivers/net/fec.h |2 +-
 drivers/net/fec_8xx/fec_8xx-netta.c   |2 +-
 drivers/net/fec_8xx/fec_main.c|2 +-
 drivers/net/fec_8xx/fec_mii.c |2 +-
 drivers/net/fs_enet/fs_enet.h |2 +-
 drivers/net/fs_enet/mac-fec.c |2 +-
 drivers/net/fs_enet/mac-scc.c |2 +-
 drivers/serial/68360serial.c  |2 +-
 drivers/serial/cpm_uart/cpm_uart_cpm1.h   |2 +-
 include/asm-powerpc/{commproc.h => cpm1.h}|8 
 include/asm-ppc/{commproc.h => cpm1.h}|8 
 31 files changed, 41 insertions(+), 42 deletions(-)
 rename arch/powerpc/sysdev/{commproc.c => cpm1.c} (99%)
 rename arch/powerpc/sysdev/{cpm2_common.c => cpm2.c} (99%)
 rename include/asm-powerpc/{commproc.h => cpm1.h} (99%)
 rename include/asm-ppc/{commproc.h => cpm1.h} (99%)

diff --git a/arch/powerpc/platforms/8xx/ep88xc.c 
b/arch/powerpc/platforms/8xx/ep88xc.c
index 9365f07..d300576 100644
--- a/arch/powerpc/platforms/8xx/ep88xc.c
+++ b/arch/powerpc/platforms/8xx/ep88xc.c
@@ -15,7 +15,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 

 struct cpm_pin {
diff --git a/arch/powerpc/platforms/8xx/mpc86xads_setup.c 
b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
index 7389590..a68509d 100644
--- a/arch/powerpc/platforms/8xx/mpc86xads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
@@ -23,7 +23,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 

diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c 
b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
index 426b897..f39447b 100644
--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
@@ -36,7 +36,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 

diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index 9a20ef4..61f2604 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -35,8 +35,8 @@ endif
 # Temporary hack until we have migrated to asm-powerpc
 ifeq ($(ARCH),powerpc)
 obj-$(CONFIG_CPM)  += cpm_common.o
-obj-$(CONFIG_CPM2) += cpm2_common.o cpm2_pic.o
+obj-$(CONFIG_CPM2) += cpm2.o cpm2_pic.o
 obj-$(CONFIG_PPC_DCR)  += dcr.o
-obj-$(CONFIG_8xx)  += mpc8xx_pic.o commproc.o
+obj-$(CONFIG_8xx)  += mpc8xx_pic.o cpm1.o
 obj-$(CONFIG_UCODE_PATCH)  += micropatch.o
 endif
diff --git a/arch/powerpc/sysdev/commproc.c b/arch/powerpc/sysdev/cpm1.c
similarity index 99%
rename from arch/powerpc/sysdev/commproc.c
rename to arch/powerpc/sysdev/cpm1.c
index ef82587..df8bd2b 100644
--- a/arch/powerpc/sysdev/commproc.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -33,7 +33,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -290,7 +290,7 @@ cpm_setbrg(uint brg, uint rate)
out_be32(bp, (((BRG_UART_CLK / rate) - 1) << 1) | CPM_BRG_EN);
else
out_be32(bp, (((BRG_UART_CLK_DIV16 / rate) - 1) << 1) |
-CPM_BRG_EN | CPM_BRG_DIV16);
+ CPM_BRG_EN | CPM_BRG_DIV16);
 }

 #ifndef CONFIG_PPC_CPM_NEW_BINDING
diff --git a/arch/powerpc/sysdev/cpm2_common.c b/arch/powerpc/sysdev/cpm2.c
similarity index 99%
rename from arch/powerpc/sysdev/cpm2_common.c
rename to arch/powerpc/sysdev/cpm2.c
index f7188e2..7be7112 100644
--- a/arch/powerpc/sysdev/cpm2_common.c
+++ b/arch/powerpc/sysdev/cpm2.c
@@ -153,8 +153,7 @@ cpm2_fastbrg(uint brg, uint 

[PATCHv2 7/8] [POWERPC] Rename commproc to cpm1 and cpm2_common.c to cpm2.c

[Jochen Friedrich]

Rename commproc.[ch] to cpm1.[ch] to be more consistent with cpm2. Also
rename cpm2_common.c to cpm2.c as suggested by Scott Wood. Adjust the
includes accordingly.

Signed-off-by: Jochen Friedrich [EMAIL PROTECTED]
---
 arch/powerpc/platforms/8xx/ep88xc.c   |2 +-
 arch/powerpc/platforms/8xx/mpc86xads_setup.c  |2 +-
 arch/powerpc/platforms/8xx/mpc885ads_setup.c  |2 +-
 arch/powerpc/sysdev/Makefile  |4 ++--
 arch/powerpc/sysdev/{commproc.c = cpm1.c}|4 ++--
 arch/powerpc/sysdev/{cpm2_common.c = cpm2.c} |3 +--
 arch/powerpc/sysdev/micropatch.c  |2 +-
 arch/ppc/8260_io/enet.c   |2 +-
 arch/ppc/8xx_io/commproc.c|2 +-
 arch/ppc/8xx_io/enet.c|6 +++---
 arch/ppc/8xx_io/fec.c |2 +-
 arch/ppc/8xx_io/micropatch.c  |2 +-
 arch/ppc/boot/simple/iic.c|2 +-
 arch/ppc/boot/simple/m8xx_tty.c   |2 +-
 arch/ppc/kernel/ppc_ksyms.c   |2 +-
 arch/ppc/platforms/mpc866ads_setup.c  |2 +-
 arch/ppc/platforms/mpc885ads_setup.c  |2 +-
 arch/ppc/syslib/mpc8xx_devices.c  |2 +-
 arch/ppc/xmon/start_8xx.c |2 +-
 drivers/net/fec.c |2 +-
 drivers/net/fec.h |2 +-
 drivers/net/fec_8xx/fec_8xx-netta.c   |2 +-
 drivers/net/fec_8xx/fec_main.c|2 +-
 drivers/net/fec_8xx/fec_mii.c |2 +-
 drivers/net/fs_enet/fs_enet.h |2 +-
 drivers/net/fs_enet/mac-fec.c |2 +-
 drivers/net/fs_enet/mac-scc.c |2 +-
 drivers/serial/68360serial.c  |2 +-
 drivers/serial/cpm_uart/cpm_uart_cpm1.h   |2 +-
 include/asm-powerpc/{commproc.h = cpm1.h}|8 
 include/asm-ppc/{commproc.h = cpm1.h}|8 
 31 files changed, 41 insertions(+), 42 deletions(-)
 rename arch/powerpc/sysdev/{commproc.c = cpm1.c} (99%)
 rename arch/powerpc/sysdev/{cpm2_common.c = cpm2.c} (99%)
 rename include/asm-powerpc/{commproc.h = cpm1.h} (99%)
 rename include/asm-ppc/{commproc.h = cpm1.h} (99%)

diff --git a/arch/powerpc/platforms/8xx/ep88xc.c 
b/arch/powerpc/platforms/8xx/ep88xc.c
index 9365f07..d300576 100644
--- a/arch/powerpc/platforms/8xx/ep88xc.c
+++ b/arch/powerpc/platforms/8xx/ep88xc.c
@@ -15,7 +15,7 @@
 #include asm/machdep.h
 #include asm/io.h
 #include asm/udbg.h
-#include asm/commproc.h
+#include asm/cpm1.h
 #include asm/mpc8xx.h

 struct cpm_pin {
diff --git a/arch/powerpc/platforms/8xx/mpc86xads_setup.c 
b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
index 7389590..a68509d 100644
--- a/arch/powerpc/platforms/8xx/mpc86xads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
@@ -23,7 +23,7 @@
 #include asm/time.h
 #include asm/mpc8xx.h
 #include asm/8xx_immap.h
-#include asm/commproc.h
+#include asm/cpm1.h
 #include asm/fs_pd.h
 #include asm/udbg.h

diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c 
b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
index 426b897..f39447b 100644
--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
@@ -36,7 +36,7 @@
 #include asm/time.h
 #include asm/mpc8xx.h
 #include asm/8xx_immap.h
-#include asm/commproc.h
+#include asm/cpm1.h
 #include asm/fs_pd.h
 #include asm/udbg.h

diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index 9a20ef4..61f2604 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -35,8 +35,8 @@ endif
 # Temporary hack until we have migrated to asm-powerpc
 ifeq ($(ARCH),powerpc)
 obj-$(CONFIG_CPM)  += cpm_common.o
-obj-$(CONFIG_CPM2) += cpm2_common.o cpm2_pic.o
+obj-$(CONFIG_CPM2) += cpm2.o cpm2_pic.o
 obj-$(CONFIG_PPC_DCR)  += dcr.o
-obj-$(CONFIG_8xx)  += mpc8xx_pic.o commproc.o
+obj-$(CONFIG_8xx)  += mpc8xx_pic.o cpm1.o
 obj-$(CONFIG_UCODE_PATCH)  += micropatch.o
 endif
diff --git a/arch/powerpc/sysdev/commproc.c b/arch/powerpc/sysdev/cpm1.c
similarity index 99%
rename from arch/powerpc/sysdev/commproc.c
rename to arch/powerpc/sysdev/cpm1.c
index ef82587..df8bd2b 100644
--- a/arch/powerpc/sysdev/commproc.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -33,7 +33,7 @@
 #include asm/page.h
 #include asm/pgtable.h
 #include asm/8xx_immap.h
-#include asm/commproc.h
+#include asm/cpm1.h
 #include asm/io.h
 #include asm/tlbflush.h
 #include asm/rheap.h
@@ -290,7 +290,7 @@ cpm_setbrg(uint brg, uint rate)
out_be32(bp, (((BRG_UART_CLK / rate) - 1)  1) | CPM_BRG_EN);
else
out_be32(bp, (((BRG_UART_CLK_DIV16 / rate) - 1)  1) |
-CPM_BRG_EN | CPM_BRG_DIV16);
+ CPM_BRG_EN | CPM_BRG_DIV16);
 }

 #ifndef CONFIG_PPC_CPM_NEW_BINDING
diff --git 

Re: [PATCHv2 7/8] [POWERPC] Rename commproc to cpm1 and cpm2_common.c to cpm2.c

[Stephen Rothwell]

Hi Jochen,

On Wed, 23 Jan 2008 17:01:57 +0100 Jochen Friedrich [EMAIL PROTECTED] wrote:

 +++ b/arch/powerpc/platforms/8xx/ep88xc.c
 @@ -15,7 +15,7 @@
   #include asm/machdep.h
   #include asm/io.h
   #include asm/udbg.h
 -#include asm/commproc.h
 +#include asm/cpm1.h
   #include asm/mpc8xx.h

Something has whitespace damaged this patch.

-- 
Cheers,
Stephen Rothwell[EMAIL PROTECTED]
http://www.canb.auug.org.au/~sfr/


pgpCgUOq3CO1v.pgp
Description: PGP signature