Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / include / asm / machdep.h

diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index a338bc7cf9d48beefa3115ec78414f62dafb015b..19d9d96eb8d357129e4db6b4cfeb521d44cabfa7 100644 (file)
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -317,28 +317,28 @@ static inline void log_error(char *buf, unsigned int err_type, int fatal)
                ppc_md.log_error(buf, err_type, fatal);
 }
 
-#define __define_machine_initcall(mach,level,fn,id) \
+#define __define_machine_initcall(mach, fn, id) \
        static int __init __machine_initcall_##mach##_##fn(void) { \
                if (machine_is(mach)) return fn(); \
                return 0; \
        } \
-       __define_initcall(level,__machine_initcall_##mach##_##fn,id);
-
-#define machine_core_initcall(mach,fn)         __define_machine_initcall(mach,"1",fn,1)
-#define machine_core_initcall_sync(mach,fn)    __define_machine_initcall(mach,"1s",fn,1s)
-#define machine_postcore_initcall(mach,fn)     __define_machine_initcall(mach,"2",fn,2)
-#define machine_postcore_initcall_sync(mach,fn)        __define_machine_initcall(mach,"2s",fn,2s)
-#define machine_arch_initcall(mach,fn)         __define_machine_initcall(mach,"3",fn,3)
-#define machine_arch_initcall_sync(mach,fn)    __define_machine_initcall(mach,"3s",fn,3s)
-#define machine_subsys_initcall(mach,fn)       __define_machine_initcall(mach,"4",fn,4)
-#define machine_subsys_initcall_sync(mach,fn)  __define_machine_initcall(mach,"4s",fn,4s)
-#define machine_fs_initcall(mach,fn)           __define_machine_initcall(mach,"5",fn,5)
-#define machine_fs_initcall_sync(mach,fn)      __define_machine_initcall(mach,"5s",fn,5s)
-#define machine_rootfs_initcall(mach,fn)       __define_machine_initcall(mach,"rootfs",fn,rootfs)
-#define machine_device_initcall(mach,fn)       __define_machine_initcall(mach,"6",fn,6)
-#define machine_device_initcall_sync(mach,fn)  __define_machine_initcall(mach,"6s",fn,6s)
-#define machine_late_initcall(mach,fn)         __define_machine_initcall(mach,"7",fn,7)
-#define machine_late_initcall_sync(mach,fn)    __define_machine_initcall(mach,"7s",fn,7s)
+       __define_initcall(__machine_initcall_##mach##_##fn, id);
+
+#define machine_core_initcall(mach, fn)                __define_machine_initcall(mach, fn, 1)
+#define machine_core_initcall_sync(mach, fn)   __define_machine_initcall(mach, fn, 1s)
+#define machine_postcore_initcall(mach, fn)    __define_machine_initcall(mach, fn, 2)
+#define machine_postcore_initcall_sync(mach, fn)       __define_machine_initcall(mach, fn, 2s)
+#define machine_arch_initcall(mach, fn)                __define_machine_initcall(mach, fn, 3)
+#define machine_arch_initcall_sync(mach, fn)   __define_machine_initcall(mach, fn, 3s)
+#define machine_subsys_initcall(mach, fn)      __define_machine_initcall(mach, fn, 4)
+#define machine_subsys_initcall_sync(mach, fn) __define_machine_initcall(mach, fn, 4s)
+#define machine_fs_initcall(mach, fn)          __define_machine_initcall(mach, fn, 5)
+#define machine_fs_initcall_sync(mach, fn)     __define_machine_initcall(mach, fn, 5s)
+#define machine_rootfs_initcall(mach, fn)      __define_machine_initcall(mach, fn, rootfs)
+#define machine_device_initcall(mach, fn)      __define_machine_initcall(mach, fn, 6)
+#define machine_device_initcall_sync(mach, fn) __define_machine_initcall(mach, fn, 6s)
+#define machine_late_initcall(mach, fn)                __define_machine_initcall(mach, fn, 7)
+#define machine_late_initcall_sync(mach, fn)   __define_machine_initcall(mach, fn, 7s)
 
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_MACHDEP_H */