Orion: general cleanup

Various Orion cleanups:
- Unify GPL license banner format across all files.
- Unify naming of .h double inclusion guard preprocessor macros.
- Unify spelling of "PCIe" (variants seen: PCIE, PCIe, PCI-EX.)
- Various typo fixes.
- Remove __init attributes from prototypes declared in headers.
- Remove trailing comments from #endif statements.
- Mark a couple of locally-used-only structs static.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Reviewed-by: Tzachi Perelstein <tzachi@marvell.com>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Nicolas Pitre <nico@marvell.com>

diff --git a/arch/arm/mach-orion/addr-map.c b/arch/arm/mach-orion/addr-map.c
index ecca987b57e93a243cb66ef68b782f13dacfc1d6..738de617e3c7400121bdcd13d537f069df5d7050 100644 (file)
--- a/arch/arm/mach-orion/addr-map.c
+++ b/arch/arm/mach-orion/addr-map.c
@@ -5,8 +5,8 @@
  *
  * Maintainer: Tzachi Perelstein <tzachi@marvell.com>
  *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
 
@@ -45,9 +45,9 @@
  * Generic Address Decode Windows bit settings
  */
 #define TARGET_DDR             0
+#define TARGET_DEV_BUS         1
 #define TARGET_PCI             3
 #define TARGET_PCIE            4
-#define TARGET_DEV_BUS         1
 #define ATTR_DDR_CS(n)         (((n) ==0) ? 0xe :      \
                                ((n) == 1) ? 0xd :      \
                                ((n) == 2) ? 0xb :      \
@@ -64,7 +64,7 @@
 #define WIN_EN                 1
 
 /*
- * Helpers to get DDR banks info
+ * Helpers to get DDR bank info
  */
 #define DDR_BASE_CS(n)         ORION_DDR_REG(0x1500 + ((n) * 8))
 #define DDR_SIZE_CS(n)         ORION_DDR_REG(0x1504 + ((n) * 8))

diff --git a/arch/arm/mach-orion/common.c b/arch/arm/mach-orion/common.c
index aae157d360e6b9947dd488773ec1578703816ef9..85c8f18268ad059e29993ff3c534efde9141995d 100644 (file)
--- a/arch/arm/mach-orion/common.c
+++ b/arch/arm/mach-orion/common.c
@@ -5,8 +5,8 @@
  *
  * Maintainer: Tzachi Perelstein <tzachi@marvell.com>
  *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
 
@@ -363,7 +363,7 @@ void __init orion_init(void)
        orion_setup_eth_wins();
 
        /*
-        * REgister devices
+        * Register devices.
         */
        platform_device_register(&orion_uart);
        platform_device_register(&orion_ehci0);

diff --git a/arch/arm/mach-orion/common.h b/arch/arm/mach-orion/common.h
index 74f23e61c4013d2e1c607f6540eccc68c1a4dffa..bcc31adaca15ff0cda8b48e6dc62d7fcf0cea661 100644 (file)
--- a/arch/arm/mach-orion/common.h
+++ b/arch/arm/mach-orion/common.h
@@ -1,13 +1,13 @@
-#ifndef __ARCH_ORION_COMMON_H__
-#define __ARCH_ORION_COMMON_H__
+#ifndef __ARCH_ORION_COMMON_H
+#define __ARCH_ORION_COMMON_H
 
 /*
  * Basic Orion init functions used early by machine-setup.
  */
 
-void __init orion_map_io(void);
-void __init orion_init_irq(void);
-void __init orion_init(void);
+void orion_map_io(void);
+void orion_init_irq(void);
+void orion_init(void);
 extern struct sys_timer orion_timer;
 
 /*
@@ -43,7 +43,7 @@ struct pci_bus *orion_pci_sys_scan_bus(int nr, struct pci_sys_data *sys);
  * (/mach-orion/gpio.c).
  */
 
-void __init orion_gpio_set_valid_pins(u32 pins);
+void orion_gpio_set_valid_pins(u32 pins);
 void gpio_display(void);       /* debug */
 
 /*
@@ -52,7 +52,7 @@ void gpio_display(void);      /* debug */
 
 struct mv643xx_eth_platform_data;
 
-void __init orion_eth_init(struct mv643xx_eth_platform_data *eth_data);
+void orion_eth_init(struct mv643xx_eth_platform_data *eth_data);
 
 /*
  * Orion Sata platform_data, used by machine-setup
@@ -60,7 +60,7 @@ void __init orion_eth_init(struct mv643xx_eth_platform_data *eth_data);
 
 struct mv_sata_platform_data;
 
-void __init orion_sata_init(struct mv_sata_platform_data *sata_data);
+void orion_sata_init(struct mv_sata_platform_data *sata_data);
 
 struct machine_desc;
 struct meminfo;
@@ -68,4 +68,5 @@ struct tag;
 extern void __init tag_fixup_mem32(struct machine_desc *, struct tag *,
                                   char **, struct meminfo *);
 
-#endif /* __ARCH_ORION_COMMON_H__ */
+
+#endif

diff --git a/arch/arm/mach-orion/db88f5281-setup.c b/arch/arm/mach-orion/db88f5281-setup.c
index aad62efa1dafc9aca9ba7975a670d38245afd889..a0a9e4851b5ffd36b26cf9127589b14bbe32d023 100644 (file)
--- a/arch/arm/mach-orion/db88f5281-setup.c
+++ b/arch/arm/mach-orion/db88f5281-setup.c
@@ -5,8 +5,8 @@
  *
  * Maintainer: Tzachi Perelstein <tzachi@marvell.com>
  *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
 

diff --git a/arch/arm/mach-orion/gpio.c b/arch/arm/mach-orion/gpio.c
index 5a7d9cc9b8004d4219eedb3919bdcc2085ea94ec..afc7be08b30f2e47871cff7229f85eb305237181 100644 (file)
--- a/arch/arm/mach-orion/gpio.c
+++ b/arch/arm/mach-orion/gpio.c
@@ -5,8 +5,8 @@
  *
  * Maintainer: Tzachi Perelstein <tzachi@marvell.com>
  *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
 

diff --git a/arch/arm/mach-orion/irq.c b/arch/arm/mach-orion/irq.c
index dc8cb15a817f748bb5d6f1f191f34b6763634286..7033cc1360ecf6f0dcc2c8b2c8dbcbb54b855bfb 100644 (file)
--- a/arch/arm/mach-orion/irq.c
+++ b/arch/arm/mach-orion/irq.c
@@ -6,7 +6,7 @@
  * Maintainer: Tzachi Perelstein <tzachi@marvell.com>
  *
  * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
+ * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
 

diff --git a/arch/arm/mach-orion/kurobox_pro-setup.c b/arch/arm/mach-orion/kurobox_pro-setup.c
index bf7034df8a6217de57fad776d028564d076873bf..be417e7f423dd4004c69a2e2547b83cdd3198d99 100644 (file)
--- a/arch/arm/mach-orion/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion/kurobox_pro-setup.c
@@ -3,8 +3,8 @@
  *
  * Maintainer: Ronen Shitrit <rshitrit@marvell.com>
  *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
 

diff --git a/arch/arm/mach-orion/pci.c b/arch/arm/mach-orion/pci.c
index e3aab14b943c18e09a6ea7ac6e4260064432a0ef..59684cc329bc497a794030e73287931d06d5848a 100644 (file)
--- a/arch/arm/mach-orion/pci.c
+++ b/arch/arm/mach-orion/pci.c
@@ -1,12 +1,12 @@
 /*
  * arch/arm/mach-orion/pci.c
  *
- * PCI and PCIE functions for Marvell Orion System On Chip
+ * PCI and PCIe functions for Marvell Orion System On Chip
  *
  * Maintainer: Tzachi Perelstein <tzachi@marvell.com>
  *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
 
@@ -18,12 +18,12 @@
 #include "common.h"
 
 /*****************************************************************************
- * Orion has one PCIE controller and one PCI controller.
+ * Orion has one PCIe controller and one PCI controller.
  *
- * Note1: The local PCIE bus number is '0'. The local PCI bus number
- * follows the scanned PCIE bridged busses, if any.
+ * Note1: The local PCIe bus number is '0'. The local PCI bus number
+ * follows the scanned PCIe bridged busses, if any.
  *
- * Note2: It is possible for PCI/PCIE agents to access many subsystem's
+ * Note2: It is possible for PCI/PCIe agents to access many subsystem's
  * space, by configuring BARs and Address Decode Windows, e.g. flashes on
  * device bus, Orion registers, etc. However this code only enable the
  * access to DDR banks.
@@ -31,7 +31,7 @@
 
 
 /*****************************************************************************
- * PCIE controller
+ * PCIe controller
  ****************************************************************************/
 #define PCIE_BASE      ((void __iomem *)ORION_PCIE_VIRT_BASE)
 
@@ -67,7 +67,7 @@ static int pcie_valid_config(int bus, int dev)
 
 
 /*
- * PCIE config cycles are done by programming the PCIE_CONF_ADDR register
+ * PCIe config cycles are done by programming the PCIE_CONF_ADDR register
  * and then reading the PCIE_CONF_DATA register. Need to make sure these
  * transactions are atomic.
  */
@@ -133,7 +133,7 @@ static int pcie_wr_conf(struct pci_bus *bus, u32 devfn,
        return ret;
 }
 
-struct pci_ops pcie_ops = {
+static struct pci_ops pcie_ops = {
        .read = pcie_rd_conf,
        .write = pcie_wr_conf,
 };
@@ -170,23 +170,23 @@ static int __init pcie_setup(struct pci_sys_data *sys)
        /*
         * IORESOURCE_IO
         */
-       res[0].name = "PCI-EX I/O Space";
+       res[0].name = "PCIe I/O Space";
        res[0].flags = IORESOURCE_IO;
        res[0].start = ORION_PCIE_IO_BUS_BASE;
        res[0].end = res[0].start + ORION_PCIE_IO_SIZE - 1;
        if (request_resource(&ioport_resource, &res[0]))
-               panic("Request PCIE IO resource failed\n");
+               panic("Request PCIe IO resource failed\n");
        sys->resource[0] = &res[0];
 
        /*
         * IORESOURCE_MEM
         */
-       res[1].name = "PCI-EX Memory Space";
+       res[1].name = "PCIe Memory Space";
        res[1].flags = IORESOURCE_MEM;
        res[1].start = ORION_PCIE_MEM_PHYS_BASE;
        res[1].end = res[1].start + ORION_PCIE_MEM_SIZE - 1;
        if (request_resource(&iomem_resource, &res[1]))
-               panic("Request PCIE Memory resource failed\n");
+               panic("Request PCIe Memory resource failed\n");
        sys->resource[1] = &res[1];
 
        sys->resource[2] = NULL;
@@ -351,7 +351,7 @@ static int orion_pci_wr_conf(struct pci_bus *bus, u32 devfn,
                                        PCI_FUNC(devfn), where, size, val);
 }
 
-struct pci_ops pci_ops = {
+static struct pci_ops pci_ops = {
        .read = orion_pci_rd_conf,
        .write = orion_pci_wr_conf,
 };
@@ -508,7 +508,7 @@ static int __init pci_setup(struct pci_sys_data *sys)
 
 
 /*****************************************************************************
- * General PCIE + PCI
+ * General PCIe + PCI
  ****************************************************************************/
 static void __devinit rc_pci_fixup(struct pci_dev *dev)
 {

diff --git a/arch/arm/mach-orion/rd88f5182-setup.c b/arch/arm/mach-orion/rd88f5182-setup.c
index 662c097ca333b5b4782d198dffbc6286ef3e1f38..f3e38ecda1ce5a13cb22dbddf765ff19d502ea0c 100644 (file)
--- a/arch/arm/mach-orion/rd88f5182-setup.c
+++ b/arch/arm/mach-orion/rd88f5182-setup.c
@@ -5,8 +5,8 @@
  *
  * Maintainer: Ronen Shitrit <rshitrit@marvell.com>
  *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
 

diff --git a/include/asm-arm/arch-orion/debug-macro.S b/include/asm-arm/arch-orion/debug-macro.S
index 2746220f5d858ccf532f02a8f200d476450be3f0..c847f8c925066579d1f3a0e9eaf6f34edd0265e2 100644 (file)
--- a/include/asm-arm/arch-orion/debug-macro.S
+++ b/include/asm-arm/arch-orion/debug-macro.S
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-orion/debug-macro.S
+ * include/asm-arm/arch-orion/debug-macro.S
  *
  * Debugging macro include header
  *

diff --git a/include/asm-arm/arch-orion/hardware.h b/include/asm-arm/arch-orion/hardware.h
index 65da374de73555e65da10f50e241198a4a973ba7..998af6029c7de2c3b41b19988d965298dd312a9f 100644 (file)
--- a/include/asm-arm/arch-orion/hardware.h
+++ b/include/asm-arm/arch-orion/hardware.h
@@ -6,8 +6,8 @@
  * published by the Free Software Foundation.
  */
 
-#ifndef __ASM_ARCH_HARDWARE_H__
-#define __ASM_ARCH_HARDWARE_H__
+#ifndef __ASM_ARCH_HARDWARE_H
+#define __ASM_ARCH_HARDWARE_H
 
 #include "orion.h"
 

diff --git a/include/asm-arm/arch-orion/io.h b/include/asm-arm/arch-orion/io.h
index 486dc04d764380285d7190d98d181ec707090770..23820153b61cf41f565b2dfd3059df1815157c51 100644 (file)
--- a/include/asm-arm/arch-orion/io.h
+++ b/include/asm-arm/arch-orion/io.h
@@ -3,13 +3,13 @@
  *
  * Tzachi Perelstein <tzachi@marvell.com>
  *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
 
-#ifndef __ASM_ARM_ARCH_IO_H
-#define __ASM_ARM_ARCH_IO_H
+#ifndef __ASM_ARCH_IO_H
+#define __ASM_ARCH_IO_H
 
 #include "orion.h"
 

diff --git a/include/asm-arm/arch-orion/irqs.h b/include/asm-arm/arch-orion/irqs.h
index eea65ca6076a46bece68a7b5165f93c7c023e129..70a2420456a37157133dd4e2ccfa36139de1f792 100644 (file)
--- a/include/asm-arm/arch-orion/irqs.h
+++ b/include/asm-arm/arch-orion/irqs.h
@@ -10,8 +10,8 @@
  *  warranty of any kind, whether express or implied.
  */
 
-#ifndef __ASM_ARCH_IRQS_H__
-#define __ASM_ARCH_IRQS_H__
+#ifndef __ASM_ARCH_IRQS_H
+#define __ASM_ARCH_IRQS_H
 
 #include "orion.h"     /* need GPIO_MAX */
 
@@ -58,4 +58,5 @@
 
 #define NR_IRQS                        (IRQ_ORION_GPIO_START + NR_GPIO_IRQS)
 
-#endif /* __ASM_ARCH_IRQS_H__ */
+
+#endif

diff --git a/include/asm-arm/arch-orion/memory.h b/include/asm-arm/arch-orion/memory.h
index d954dba87ced8f1d6d497546f3a720d98614c984..d9300d62a53482528f58ed97ad1805235b848734 100644 (file)
--- a/include/asm-arm/arch-orion/memory.h
+++ b/include/asm-arm/arch-orion/memory.h
@@ -4,12 +4,13 @@
  * Marvell Orion memory definitions
  */
 
-#ifndef __ASM_ARCH_MMU_H
-#define __ASM_ARCH_MMU_H
+#ifndef __ASM_ARCH_MEMORY_H
+#define __ASM_ARCH_MEMORY_H
 
 #define PHYS_OFFSET    UL(0x00000000)
 
 #define __virt_to_bus(x)       __virt_to_phys(x)
 #define __bus_to_virt(x)       __phys_to_virt(x)
 
+
 #endif

diff --git a/include/asm-arm/arch-orion/orion.h b/include/asm-arm/arch-orion/orion.h
index d0b32c379ae43dd3e977f26a9c2f685c95bec882..01f1299472d13e33a596bd500a292965288c63e1 100644 (file)
--- a/include/asm-arm/arch-orion/orion.h
+++ b/include/asm-arm/arch-orion/orion.h
@@ -11,8 +11,8 @@
  * warranty of any kind, whether express or implied.
  */
 
-#ifndef __ASM_ARCH_ORION_H__
-#define __ASM_ARCH_ORION_H__
+#ifndef __ASM_ARCH_ORION_H
+#define __ASM_ARCH_ORION_H
 
 /*****************************************************************************
  * Orion Address Maps
@@ -91,6 +91,7 @@
 
 #define ORION_BRIDGE_VIRT_BASE         (ORION_REGS_VIRT_BASE | 0x20000)
 #define ORION_BRIDGE_REG(x)            (ORION_BRIDGE_VIRT_BASE | (x))
+#define  TIMER_VIRT_BASE               (ORION_BRIDGE_VIRT_BASE | 0x300)
 
 #define ORION_PCI_VIRT_BASE            (ORION_REGS_VIRT_BASE | 0x30000)
 #define ORION_PCI_REG(x)               (ORION_PCI_VIRT_BASE | (x))
@@ -154,7 +155,5 @@
 #define MAIN_IRQ_CAUSE         ORION_BRIDGE_REG(0x200)
 #define MAIN_IRQ_MASK          ORION_BRIDGE_REG(0x204)
 
-#define TIMER_VIRT_BASE                (ORION_BRIDGE_VIRT_BASE | 0x300)
-
 
 #endif

diff --git a/include/asm-arm/arch-orion/system.h b/include/asm-arm/arch-orion/system.h
index 17704c68f90ed7469d790a2743f730af60d3e5a3..653f992bbe6017e8c2a6a60a169d4f923eb51125 100644 (file)
--- a/include/asm-arm/arch-orion/system.h
+++ b/include/asm-arm/arch-orion/system.h
@@ -3,8 +3,8 @@
  *
  * Tzachi Perelstein <tzachi@marvell.com>
  *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
 
@@ -28,4 +28,5 @@ static inline void arch_reset(char mode)
        orion_setbits(CPU_SOFT_RESET, 1);
 }
 
+
 #endif

diff --git a/include/asm-arm/arch-orion/timex.h b/include/asm-arm/arch-orion/timex.h
index cc0fc7075ebe990e555fedbf91d0a73d4ae72d51..85588d9c22ef6853ae4f15a52c85456a98880f68 100644 (file)
--- a/include/asm-arm/arch-orion/timex.h
+++ b/include/asm-arm/arch-orion/timex.h
@@ -3,8 +3,8 @@
  *
  * Tzachi Perelstein <tzachi@marvell.com>
  *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
 

diff --git a/include/asm-arm/arch-orion/uncompress.h b/include/asm-arm/arch-orion/uncompress.h
index 59f44039909a9b40e113d7fc55bba23c8eb997be..03306cdd51bef16db82040533cab478de1115d96 100644 (file)
--- a/include/asm-arm/arch-orion/uncompress.h
+++ b/include/asm-arm/arch-orion/uncompress.h
@@ -3,8 +3,8 @@
  *
  * Tzachi Perelstein <tzachi@marvell.com>
  *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */