Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[linux-2.6] / drivers / s390 / scsi / zfcp_dbf.c

diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c
index 5f3212440f68594b304e9c0b48074b1c3c0618bd..701046c9bb330ef8dc1ca6d0a76516755a5687ea 100644 (file)
--- a/drivers/s390/scsi/zfcp_dbf.c
+++ b/drivers/s390/scsi/zfcp_dbf.c
@@ -19,8 +19,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <asm/debug.h>
 #include <linux/ctype.h>
+#include <asm/debug.h>
 #include "zfcp_ext.h"
 
 static u32 dbfsize = 4;
@@ -35,17 +35,17 @@ static int
 zfcp_dbf_stck(char *out_buf, const char *label, unsigned long long stck)
 {
        unsigned long long sec;
-       struct timespec xtime;
+       struct timespec dbftime;
        int len = 0;
 
        stck -= 0x8126d60e46000000LL - (0x3c26700LL * 1000000 * 4096);
        sec = stck >> 12;
        do_div(sec, 1000000);
-       xtime.tv_sec = sec;
+       dbftime.tv_sec = sec;
        stck -= (sec * 1000000) << 12;
-       xtime.tv_nsec = ((stck * 1000) >> 12);
+       dbftime.tv_nsec = ((stck * 1000) >> 12);
        len += sprintf(out_buf + len, "%-24s%011lu:%06lu\n",
-                      label, xtime.tv_sec, xtime.tv_nsec);
+                      label, dbftime.tv_sec, dbftime.tv_nsec);
 
        return len;
 }
@@ -161,12 +161,6 @@ void zfcp_hba_dbf_event_fsf_response(struct zfcp_fsf_req *fsf_req)
                   (fsf_req->fsf_command == FSF_QTCB_OPEN_LUN)) {
                strncpy(rec->tag2, "open", ZFCP_DBF_TAG_SIZE);
                level = 4;
-       } else if ((prot_status_qual->doubleword[0] != 0) ||
-                  (prot_status_qual->doubleword[1] != 0) ||
-                  (fsf_status_qual->doubleword[0] != 0) ||
-                  (fsf_status_qual->doubleword[1] != 0)) {
-               strncpy(rec->tag2, "qual", ZFCP_DBF_TAG_SIZE);
-               level = 3;
        } else {
                strncpy(rec->tag2, "norm", ZFCP_DBF_TAG_SIZE);
                level = 6;