From 23fbc317439f91b21d5e93ba0f78bbef7e2b8c38 Mon Sep 17 00:00:00 2001
From: Jan Glauber <jang@linux.vnet.ibm.com>
Date: Fri, 12 Jun 2009 10:26:29 +0200
Subject: [PATCH] --- yaml --- r: 148762 b: refs/heads/master c:
 a7c65a559ac371a08e67600ae585052441d71392 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/s390/cio/qdio_perf.c | 12 ------------
 trunk/drivers/s390/cio/qdio_perf.h | 10 ++++++----
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 2d59ac02d0cd..182b0cf17c50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c57542320e73b9ff46b04092273dbcc184a4fb6
+refs/heads/master: a7c65a559ac371a08e67600ae585052441d71392
diff --git a/trunk/drivers/s390/cio/qdio_perf.c b/trunk/drivers/s390/cio/qdio_perf.c
index 136d0f0b1e93..eff943923c6f 100644
--- a/trunk/drivers/s390/cio/qdio_perf.c
+++ b/trunk/drivers/s390/cio/qdio_perf.c
@@ -25,18 +25,6 @@ struct qdio_perf_stats perf_stats;
 static struct proc_dir_entry *qdio_perf_pde;
 #endif
 
-inline void qdio_perf_stat_inc(atomic_long_t *count)
-{
-	if (qdio_performance_stats)
-		atomic_long_inc(count);
-}
-
-inline void qdio_perf_stat_dec(atomic_long_t *count)
-{
-	if (qdio_performance_stats)
-		atomic_long_dec(count);
-}
-
 /*
  * procfs functions
  */
diff --git a/trunk/drivers/s390/cio/qdio_perf.h b/trunk/drivers/s390/cio/qdio_perf.h
index 7821ac4fa517..ff4504ce1e3c 100644
--- a/trunk/drivers/s390/cio/qdio_perf.h
+++ b/trunk/drivers/s390/cio/qdio_perf.h
@@ -9,7 +9,6 @@
 #define QDIO_PERF_H
 
 #include <linux/types.h>
-#include <linux/device.h>
 #include <asm/atomic.h>
 
 struct qdio_perf_stats {
@@ -50,10 +49,13 @@ struct qdio_perf_stats {
 extern struct qdio_perf_stats perf_stats;
 extern int qdio_performance_stats;
 
+static inline void qdio_perf_stat_inc(atomic_long_t *count)
+{
+	if (qdio_performance_stats)
+		atomic_long_inc(count);
+}
+
 int qdio_setup_perf_stats(void);
 void qdio_remove_perf_stats(void);
 
-extern void qdio_perf_stat_inc(atomic_long_t *count);
-extern void qdio_perf_stat_dec(atomic_long_t *count);
-
 #endif