From: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Date: Thu, 25 Aug 2005 22:03:35 +0000 (+0100)
Subject: [PATCH] bogus function type in qdio
X-Git-Tag: v2.6.13~25
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a46206e74e1897bf34d6b58f0991a0d6f3797e27;p=linux-2.6-omap-h63xx.git

[PATCH] bogus function type in qdio

In qdio_get_micros() volatile in return type is plain noise (even with old
gccisms it would make no sense - noreturn function returning __u64 is a
bit odd ;-)

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index 533f90c05cd..381f339e320 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -112,7 +112,7 @@ qdio_min(int a,int b)
 
 /***************** SCRUBBER HELPER ROUTINES **********************/
 
-static inline volatile __u64 
+static inline __u64 
 qdio_get_micros(void)
 {
         return (get_clock() >> 10); /* time>>12 is microseconds */