Skip to contentSkip to conversation

arm: msm: smd: msm7x30 a2m clean up

PATCH In review Daniel Walker 2 participants 2 messages Mar 26, 2010 – Mar 27, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 4/7 arm: msm: smd: msm7x30 a2m clean up

This moves the msm_a2m_int() function into the header, and does a small macro clean up to be more inline with Linux norms. No functional changes.

---
 arch/arm/mach-msm/smd.c         |   12 ------------
 arch/arm/mach-msm/smd_private.h |   16 ++++++++++++++++
 2 files changed, 16 insertions(+), 12 deletions(-)
arch/arm/mach-msm/smd.c +0 -12
index 2e32d9a..2a9b85c 100644
@@ -26,10 +26,8 @@
 #include <linux/slab.h>
 #include <linux/debugfs.h>
 #include <linux/delay.h>
-#include <linux/io.h>
 
 #include <mach/msm_smd.h>
-#include <mach/msm_iomap.h>
 #include <mach/system.h>
 
 #include "smd_private.h"
@@ -69,16 +67,6 @@ static void smd_diag(void);
 
 static unsigned last_heap_free = 0xffffffff;
 
-static inline void msm_a2m_int(uint32_t irq)
-{
-#if defined(CONFIG_ARCH_MSM7X30)
-	writel(1 << irq, MSM_GCC_BASE + 0x8);
-#else
-	writel(1, MSM_CSR_BASE + 0x400 + (irq * 4));
-#endif
-}
-
-
 static inline void notify_other_smsm(void)
 {
 	msm_a2m_int(5);
arch/arm/mach-msm/smd_private.h +16 -0
index a403424..54a6007 100644
@@ -19,6 +19,9 @@
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
 #include <linux/list.h>
+#include <linux/io.h>
+
+#include <mach/msm_iomap.h>
 
 struct smem_heap_info {
 	unsigned initialized;
@@ -384,4 +387,17 @@ static inline int _smd_alloc_channel(struct smd_channel *ch)
 }
 #endif /* CONFIG_ARCH_MSM7X00A */
 
+#if defined(CONFIG_ARCH_MSM7X30)
+static inline void msm_a2m_int(uint32_t irq)
+{
+	writel(1 << irq, MSM_GCC_BASE + 0x8);
+}
+#else
+static inline void msm_a2m_int(uint32_t irq)
+{
+	writel(1, MSM_CSR_BASE + 0x400 + (irq * 4));
+}
+#endif /* CONFIG_ARCH_MSM7X30 */
+
+
 #endif
Signature · 1 line
1.6.2.3
#1 lore raw
Quoted 5 lines · Daniel Walker

This moves the msm_a2m_int() function into the header, and does a small macro clean up to be more inline with Linux norms. No functional changes.

ACK.

Quoted 69 lines
---
 arch/arm/mach-msm/smd.c         |   12 ------------
 arch/arm/mach-msm/smd_private.h |   16 ++++++++++++++++
 2 files changed, 16 insertions(+), 12 deletions(-)
arch/arm/mach-msm/smd.c +0 -12
index 2e32d9a..2a9b85c 100644
@@ -26,10 +26,8 @@
 #include <linux/slab.h>
 #include <linux/debugfs.h>
 #include <linux/delay.h>
-#include <linux/io.h>
 
 #include <mach/msm_smd.h>
-#include <mach/msm_iomap.h>
 #include <mach/system.h>
 
 #include "smd_private.h"
@@ -69,16 +67,6 @@ static void smd_diag(void);
 
 static unsigned last_heap_free = 0xffffffff;
 
-static inline void msm_a2m_int(uint32_t irq)
-{
-#if defined(CONFIG_ARCH_MSM7X30)
-	writel(1 << irq, MSM_GCC_BASE + 0x8);
-#else
-	writel(1, MSM_CSR_BASE + 0x400 + (irq * 4));
-#endif
-}
-
-
 static inline void notify_other_smsm(void)
 {
 	msm_a2m_int(5);
arch/arm/mach-msm/smd_private.h +16 -0
index a403424..54a6007 100644
@@ -19,6 +19,9 @@
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
 #include <linux/list.h>
+#include <linux/io.h>
+
+#include <mach/msm_iomap.h>
 
 struct smem_heap_info {
 	unsigned initialized;
@@ -384,4 +387,17 @@ static inline int _smd_alloc_channel(struct smd_channel *ch)
 }
 #endif /* CONFIG_ARCH_MSM7X00A */
 
+#if defined(CONFIG_ARCH_MSM7X30)
+static inline void msm_a2m_int(uint32_t irq)
+{
+	writel(1 << irq, MSM_GCC_BASE + 0x8);
+}
+#else
+static inline void msm_a2m_int(uint32_t irq)
+{
+	writel(1, MSM_CSR_BASE + 0x400 + (irq * 4));
+}
+#endif /* CONFIG_ARCH_MSM7X30 */
+
+
 #endif
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html