From: Tony Lindgren <tony@atomide.com>
Date: Fri, 30 Nov 2007 19:57:13 +0000 (-0800)
Subject: ARM: OMAP: Misc minor clean-up for upstream merge
X-Git-Tag: v2.6.24-omap1~138
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=23d56050eaa6c0e53dcbee42a2a880321c2d17ca;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Misc minor clean-up for upstream merge

Misc minor clean-up for upstream merge

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index cd5d355f4c5..972f81c66f7 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -14,7 +14,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
-#include <linux/ptrace.h>
 #include <linux/sysdev.h>
 #include <linux/err.h>
 #include <linux/clk.h>
@@ -138,7 +137,7 @@ struct gpio_bank {
 	u16 virtual_irq_start;
 	int method;
 	u32 reserved_map;
-#if defined (CONFIG_ARCH_OMAP16XX) || defined (CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
+#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
 	u32 suspend_wakeup;
 	u32 saved_wakeup;
 #endif
@@ -1501,7 +1500,7 @@ static int __init _omap_gpio_init(void)
 	return 0;
 }
 
-#if defined (CONFIG_ARCH_OMAP16XX) || defined (CONFIG_ARCH_OMAP24XX) || defined (CONFIG_ARCH_OMAP34XX)
+#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
 static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg)
 {
 	int i;
diff --git a/arch/arm/plat-omap/mmu.c b/arch/arm/plat-omap/mmu.c
index c80d411d185..5c0a9efbb05 100644
--- a/arch/arm/plat-omap/mmu.c
+++ b/arch/arm/plat-omap/mmu.c
@@ -58,7 +58,7 @@
 #define CAMERA_MMU_LOCK_BASE_MASK	(0x7 << MMU_LOCK_BASE_SHIFT)
 #define CAMERA_MMU_LOCK_VICTIM_MASK	(0x7 << MMU_LOCK_VICTIM_SHIFT)
 
-#define is_aligned(adr,align)	(!((adr)&((align)-1)))
+#define is_aligned(adr, align)	(!((adr)&((align)-1)))
 #define ORDER_1MB	(20 - PAGE_SHIFT)
 #define ORDER_64KB	(16 - PAGE_SHIFT)
 #define ORDER_4KB	(12 - PAGE_SHIFT)
@@ -1199,7 +1199,7 @@ static ssize_t exmem_read(struct omap_mmu *mmu, char *buf, size_t count,
 }
 
 static ssize_t omap_mmu_mem_read(struct kobject *kobj,
-				 struct bin_attribute * attr,
+				 struct bin_attribute *attr,
 				 char *buf, loff_t offset, size_t count)
 {
 	struct device *dev = to_dev(kobj);
@@ -1266,7 +1266,7 @@ static ssize_t exmem_write(struct omap_mmu *mmu, char *buf, size_t count,
 }
 
 static ssize_t omap_mmu_mem_write(struct kobject *kobj,
-				  struct bin_attribute * attr,
+				  struct bin_attribute *attr,
 				  char *buf, loff_t offset, size_t count)
 {
 	struct device *dev = to_dev(kobj);
@@ -1301,7 +1301,7 @@ static struct bin_attribute dev_attr_mem = {
 
 /* To be obsolete for backward compatibility */
 ssize_t __omap_mmu_mem_read(struct omap_mmu *mmu,
-			    struct bin_attribute * attr,
+			    struct bin_attribute *attr,
 			    char *buf, loff_t offset, size_t count)
 {
 	return omap_mmu_mem_read(&mmu->dev.kobj, attr, buf, offset, count);
@@ -1309,7 +1309,7 @@ ssize_t __omap_mmu_mem_read(struct omap_mmu *mmu,
 EXPORT_SYMBOL_GPL(__omap_mmu_mem_read);
 
 ssize_t __omap_mmu_mem_write(struct omap_mmu *mmu,
-			     struct bin_attribute * attr,
+			     struct bin_attribute *attr,
 			     char *buf, loff_t offset, size_t count)
 {
 	return omap_mmu_mem_write(&mmu->dev.kobj, attr, buf, offset, count);