From c2da03771e29159627c5c7b9509ec70bce9f91ee Mon Sep 17 00:00:00 2001
From: Pekka Paalanen
Date: Mon, 28 Apr 2008 21:25:22 +0300
Subject: [PATCH] mmiotrace: code style cleanups

Signed-off-by: Pekka Paalanen
---
arch/x86/mm/kmmio.c | 4 ++--
arch/x86/mm/mmio-mod.c | 7 +++----
arch/x86/mm/testmmiotrace.c | 2 +-
include/linux/mmiotrace.h | 6 +-----
4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c
index b4287b7..40567d8 100644
--- a/arch/x86/mm/kmmio.c
+++ b/arch/x86/mm/kmmio.c
@@ -18,10 +18,10 @@
#include
#include
#include
-#include
+#include
#include
#include
-#include
+#include
#include
#include

diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
index 1f77d85..a8d2a00 100644
--- a/arch/x86/mm/mmio-mod.c
+++ b/arch/x86/mm/mmio-mod.c
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -418,11 +418,10 @@ static void enter_uniprocessor(void)

for_each_cpu_mask(cpu, downed_cpus) {
err = cpu_down(cpu);
- if (!err) {
+ if (!err)
pr_info(NAME "CPU%d is down.\n", cpu);
- } else {
+ else
pr_err(NAME "Error taking CPU%d down: %d\n", cpu, err);
- }
}
if (num_online_cpus() > 1)
pr_warning(NAME "multiple CPUs still online, "
diff --git a/arch/x86/mm/testmmiotrace.c b/arch/x86/mm/testmmiotrace.c
index cfa60b2..d877c5b 100644
--- a/arch/x86/mm/testmmiotrace.c
+++ b/arch/x86/mm/testmmiotrace.c
@@ -2,7 +2,7 @@
* Written by Pekka Paalanen, 2008
*/
#include
-#include
+#include

#define MODULE_NAME "testmmiotrace"

diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
index dd6b64b..de8e912 100644
--- a/include/linux/mmiotrace.h
+++ b/include/linux/mmiotrace.h
@@ -1,9 +1,7 @@
#ifndef MMIOTRACE_H
#define MMIOTRACE_H

-#include
-
-#ifdef __KERNEL__
+#include

#include

@@ -84,6 +82,4 @@ extern void disable_mmiotrace(void);
extern void mmio_trace_rw(struct mmiotrace_rw *rw);
extern void mmio_trace_mapping(struct mmiotrace_map *map);

-#endif /* __KERNEL__ */
-
#endif /* MMIOTRACE_H */
--
1.5.3.7

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/