aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-spear
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-spear')
-rw-r--r--arch/arm/mach-spear/spear1310.c2
-rw-r--r--arch/arm/mach-spear/spear1340.c6
-rw-r--r--arch/arm/mach-spear/spear13xx.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-spear/spear1310.c b/arch/arm/mach-spear/spear1310.c
index 824b12a56a42..d9ce4d8000f0 100644
--- a/arch/arm/mach-spear/spear1310.c
+++ b/arch/arm/mach-spear/spear1310.c
@@ -42,7 +42,7 @@ static const char * const spear1310_dt_board_compat[] = {
42 * PHYSICAL VIRTUAL 42 * PHYSICAL VIRTUAL
43 * 0xD8000000 0xFA000000 43 * 0xD8000000 0xFA000000
44 */ 44 */
45struct map_desc spear1310_io_desc[] __initdata = { 45static struct map_desc spear1310_io_desc[] __initdata = {
46 { 46 {
47 .virtual = VA_SPEAR1310_RAS_GRP1_BASE, 47 .virtual = VA_SPEAR1310_RAS_GRP1_BASE,
48 .pfn = __phys_to_pfn(SPEAR1310_RAS_GRP1_BASE), 48 .pfn = __phys_to_pfn(SPEAR1310_RAS_GRP1_BASE),
diff --git a/arch/arm/mach-spear/spear1340.c b/arch/arm/mach-spear/spear1340.c
index 7b6bff7154e1..c601799b4aea 100644
--- a/arch/arm/mach-spear/spear1340.c
+++ b/arch/arm/mach-spear/spear1340.c
@@ -93,7 +93,7 @@ static int sata_miphy_init(struct device *dev, void __iomem *addr)
93 return 0; 93 return 0;
94} 94}
95 95
96void sata_miphy_exit(struct device *dev) 96static void sata_miphy_exit(struct device *dev)
97{ 97{
98 writel(0, SPEAR1340_PCIE_SATA_CFG); 98 writel(0, SPEAR1340_PCIE_SATA_CFG);
99 writel(0, SPEAR1340_PCIE_MIPHY_CFG); 99 writel(0, SPEAR1340_PCIE_MIPHY_CFG);
@@ -107,7 +107,7 @@ void sata_miphy_exit(struct device *dev)
107 msleep(20); 107 msleep(20);
108} 108}
109 109
110int sata_suspend(struct device *dev) 110static int sata_suspend(struct device *dev)
111{ 111{
112 if (dev->power.power_state.event == PM_EVENT_FREEZE) 112 if (dev->power.power_state.event == PM_EVENT_FREEZE)
113 return 0; 113 return 0;
@@ -117,7 +117,7 @@ int sata_suspend(struct device *dev)
117 return 0; 117 return 0;
118} 118}
119 119
120int sata_resume(struct device *dev) 120static int sata_resume(struct device *dev)
121{ 121{
122 if (dev->power.power_state.event == PM_EVENT_THAW) 122 if (dev->power.power_state.event == PM_EVENT_THAW)
123 return 0; 123 return 0;
diff --git a/arch/arm/mach-spear/spear13xx.c b/arch/arm/mach-spear/spear13xx.c
index c9897ea38980..8b56fe61a492 100644
--- a/arch/arm/mach-spear/spear13xx.c
+++ b/arch/arm/mach-spear/spear13xx.c
@@ -57,7 +57,7 @@ void __init spear13xx_l2x0_init(void)
57 * 0xEC000000 0xFC000000 57 * 0xEC000000 0xFC000000
58 * 0xED000000 0xFB000000 58 * 0xED000000 0xFB000000
59 */ 59 */
60struct map_desc spear13xx_io_desc[] __initdata = { 60static struct map_desc spear13xx_io_desc[] __initdata = {
61 { 61 {
62 .virtual = (unsigned long)VA_PERIP_GRP2_BASE, 62 .virtual = (unsigned long)VA_PERIP_GRP2_BASE,
63 .pfn = __phys_to_pfn(PERIP_GRP2_BASE), 63 .pfn = __phys_to_pfn(PERIP_GRP2_BASE),