ARM: OMAP: User GPLv2 for MMU, make checkpatch.pl happier

index 2d05708..3bb3efe 100644
@@ -9,18 +9,8 @@
  *        and Paul Mundt <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  */
 #include <linux/types.h>
 #include <linux/init.h>

@@ -286,7 +276,7 @@ static void omap1_mmu_interrupt(struct omap_mmu *mmu)
 
 	/* if the fault is masked, nothing to do */
 	if ((status & MMUFAULT_MASK) == 0) {
-		pr_debug( "MMU interrupt, but ignoring.\n");
+		pr_debug("MMU interrupt, but ignoring.\n");
 		/*
 		 * note: in OMAP1710,
 		 * when CACHE + DMA domain gets out of idle in DSP,

@@ -294,16 +284,16 @@ static void omap1_mmu_interrupt(struct omap_mmu *mmu)
 		 * in this case, we just ignore the interrupt.
 		 */
 		if (status) {
-			pr_debug( "%s%s%s%s\n",
-				  (status & OMAP_MMU_FAULT_ST_PREF)?
-				  "  (prefetch err)" : "",
-				  (status & OMAP_MMU_FAULT_ST_PERM)?
-				  "  (permission fault)" : "",
-				  (status & OMAP_MMU_FAULT_ST_TLB_MISS)?
-				  "  (TLB miss)" : "",
-				  (status & OMAP_MMU_FAULT_ST_TRANS) ?
-				  "  (translation fault)": "");
-			pr_debug( "fault address = %#08lx\n", va);
+			pr_debug("%s%s%s%s\n",
+				 (status & OMAP_MMU_FAULT_ST_PREF)?
+				 "  (prefetch err)" : "",
+				 (status & OMAP_MMU_FAULT_ST_PERM)?
+				 "  (permission fault)" : "",
+				 (status & OMAP_MMU_FAULT_ST_TLB_MISS)?
+				 "  (TLB miss)" : "",
+				 (status & OMAP_MMU_FAULT_ST_TRANS) ?
+				 "  (translation fault)": "");
+			pr_debug("fault address = %#08lx\n", va);
 		}
 		enable_irq(mmu->irq);
 		return;

index 521c3bf..918688e 100644
@@ -76,7 +76,7 @@
 
 #define OMAP_MMU_LD_TLB_RD		0x0002
 
-#define INIT_TLB_ENTRY(ent,v,p,ps)			\
+#define INIT_TLB_ENTRY(ent, v, p, ps)			\
 do {							\
 	(ent)->va	= (v);				\
 	(ent)->pa	= (p);				\

@@ -86,7 +86,7 @@ do {							\
 	(ent)->tlb	= 1;				\
 } while (0)
 
-#define INIT_TLB_ENTRY_4KB_PRESERVED(ent,v,p)		\
+#define INIT_TLB_ENTRY_4KB_PRESERVED(ent, v, p)	\
 do {							\
 	(ent)->va	= (v);				\
 	(ent)->pa	= (p);				\

index d5c1583..f8bb6df 100644
@@ -11,18 +11,8 @@
  * TWL support: Hiroshi DOYU <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  */
 #include <linux/types.h>
 #include <linux/init.h>

index 818ea8c..bae9db7 100644
@@ -59,7 +59,7 @@
 
 #define IOMAP_VAL	0x3f
 
-#define INIT_TLB_ENTRY(ent,v,p,ps)				\
+#define INIT_TLB_ENTRY(ent, v, p, ps)				\
 do {								\
 	(ent)->va	= (v);					\
 	(ent)->pa	= (p);					\

@@ -71,7 +71,7 @@ do {								\
 	(ent)->tlb	= 1;					\
 } while (0)
 
-#define INIT_TLB_ENTRY_4KB_PRESERVED(ent,v,p) \
+#define INIT_TLB_ENTRY_4KB_PRESERVED(ent, v, p)		\
 do {								\
 	(ent)->va	= (v);					\
 	(ent)->pa	= (p);					\

@@ -82,7 +82,7 @@ do {								\
 	(ent)->mixed	= 0;					\
 } while (0)
 
-#define INIT_TLB_ENTRY_4KB_ES32_PRESERVED(ent,v,p)		\
+#define INIT_TLB_ENTRY_4KB_ES32_PRESERVED(ent, v, p)		\
 do {								\
 	(ent)->va	= (v);					\
 	(ent)->pa	= (p);					\

index 5c0a9ef..b7ae3d2 100644
@@ -11,18 +11,8 @@
  * TWL support: Hiroshi DOYU <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  */
 #include <linux/module.h>
 #include <linux/mempool.h>

@@ -1466,13 +1456,8 @@ static ssize_t mempool_show(struct class *class, char *buf)
 
 static CLASS_ATTR(mempool, S_IRUGO, mempool_show, NULL);
 
-static void omap_mmu_class_dev_release(struct device *dev)
-{
-}
-
 static struct class omap_mmu_class = {
 	.name		= "mmu",
-	.dev_release	= omap_mmu_class_dev_release,
 };
 
 int omap_mmu_register(struct omap_mmu *mmu)

index c52b6c6..fa8f3a6 100644
@@ -5,20 +5,9 @@
  *
  * Contact: Toshihiro Kobayashi <[email protected]>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  */
 
 #ifndef ASM_ARCH_DSP_COMMON_H

index b7ae3d2..9f05d5a 100644
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/clk.h>
+#include <linux/sysdev.h>
 #include <linux/device.h>
 #include <linux/interrupt.h>
 #include <asm/uaccess.h>

@@ -1429,7 +1430,7 @@ static ssize_t exmap_store(struct device *dev, struct device_attribute *attr,
 
 static DEVICE_ATTR(exmap, S_IRUGO | S_IWUSR, exmap_show, exmap_store);
 
-static ssize_t mempool_show(struct class *class, char *buf)
+static ssize_t mempool_show(struct sysdev_class *class, char *buf)
 {
 	int min_nr_1M = 0, curr_nr_1M = 0;
 	int min_nr_64K = 0, curr_nr_64K = 0;

@@ -1454,17 +1455,16 @@ static ssize_t mempool_show(struct class *class, char *buf)
 }
 
 
-static CLASS_ATTR(mempool, S_IRUGO, mempool_show, NULL);
+static SYSDEV_CLASS_ATTR(mempool, S_IRUGO, mempool_show, NULL);
 
-static struct class omap_mmu_class = {
-	.name		= "mmu",
+static struct sysdev_class omap_mmu = {
+	set_kset_name("mmu"),
 };
 
 int omap_mmu_register(struct omap_mmu *mmu)
 {
 	int ret;
 
-	mmu->dev.class = &omap_mmu_class;
 	strlcpy(mmu->dev.bus_id, mmu->name, KOBJ_NAME_LEN);
 	dev_set_drvdata(&mmu->dev, mmu);
 

@@ -1548,22 +1548,22 @@ void omap_mmu_unregister(struct omap_mmu *mmu)
 }
 EXPORT_SYMBOL_GPL(omap_mmu_unregister);
 
-static int __init omap_mmu_class_init(void)
+static int __init omap_mmu_sysdev_init(void)
 {
-	int ret = class_register(&omap_mmu_class);
+	int ret = sysdev_class_register(&omap_mmu);
 	if (!ret)
-		ret = class_create_file(&omap_mmu_class, &class_attr_mempool);
+		ret = sysdev_class_create_file(&omap_mmu, &attr_mempool);
 
 	return ret;
 }
 
-static void __exit omap_mmu_class_exit(void)
+static void __exit omap_mmu_sysdev_exit(void)
 {
-	class_remove_file(&omap_mmu_class, &class_attr_mempool);
-	class_unregister(&omap_mmu_class);
+	sysdev_class_remove_file(&omap_mmu, &attr_mempool);
+	sysdev_class_unregister(&omap_mmu);
 }
 
-subsys_initcall(omap_mmu_class_init);
-module_exit(omap_mmu_class_exit);
+subsys_initcall(omap_mmu_sysdev_init);
+module_exit(omap_mmu_sysdev_exit);
 
 MODULE_LICENSE("GPL");

351 lines not on this page · raw message

119 lines not on this page · raw message

330 lines not on this page · raw message

117 lines not on this page · raw message

1,569 lines not on this page · raw message

Index: linux-2.6/include/asm-arm/arch-omap/dsp_common.h
===================================================================
@@ -5,20 +5,9 @@
  *
  * Contact: Toshihiro Kobayashi <[email protected]>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  */
 
 #ifndef ASM_ARCH_DSP_COMMON_H

@@ -27,8 +16,12 @@
 #ifdef CONFIG_ARCH_OMAP1
 extern void omap_dsp_request_mpui(void);
 extern void omap_dsp_release_mpui(void);
-extern int omap_dsp_request_mem(void);
-extern int omap_dsp_release_mem(void);
 #endif
 
+static inline int omap_dsp_request_mem(void)
+{
+	return 0;
+}
+#define omap_dsp_release_mem()	do {} while (0)
+
 #endif /* ASM_ARCH_DSP_COMMON_H */

211 lines not on this page · raw message

Index: linux-2.6/include/asm-arm/pgtable.h
===================================================================
@@ -289,6 +289,7 @@ PTE_BIT_FUNC(mkyoung,   |= L_PTE_YOUNG);
 #define pmd_none(pmd)		(!pmd_val(pmd))
 #define pmd_present(pmd)	(pmd_val(pmd))
 #define pmd_bad(pmd)		(pmd_val(pmd) & 2)
+#define pmd_table(pmd)		((pmd_val(pmd) & PMD_TYPE_MASK) == PMD_TYPE_TABLE)
 
 #define copy_pmd(pmdpd,pmdps)		\
 	do {				\