patch-1.3.28 linux/drivers/scsi/constants.c

• Lines: 37
• Date: Mon Sep 18 08:54:09 1995
• Orig file: v1.3.27/linux/drivers/scsi/constants.c
• Orig date: Wed Aug 2 13:21:07 1995

diff -u --recursive --new-file v1.3.27/linux/drivers/scsi/constants.c linux/drivers/scsi/constants.c
@@ -382,7 +382,6 @@
     int sense_class, valid, code;
     unsigned char * sense_buffer = SCpnt->sense_buffer;
     const char * error = NULL;
-    int dev = SCpnt->request.dev;
     
     sense_class = (sense_buffer[0] >> 4) & 0x07;
     code = sense_buffer[0] & 0xf;
@@ -413,9 +412,11 @@
 	printk("%s error ", error);
 	
 #if (CONSTANTS & CONST_SENSE)
-	printk( "%s%x: sense key %s\n", devclass, dev, snstext[sense_buffer[2] & 0x0f]);
+	printk( "%s%s: sense key %s\n", devclass,
+	       kdevname(SCpnt->request.rq_dev), snstext[sense_buffer[2] & 0x0f]);
 #else
-	printk("%s%x: sns = %2x %2x\n", devclass, dev, sense_buffer[0], sense_buffer[2]);
+	printk("%s%s: sns = %2x %2x\n", devclass,
+	       kdevname(SCpnt->request.rq_dev), sense_buffer[0], sense_buffer[2]);
 #endif
 	
 	/* Check to see if additional sense information is available */
@@ -443,10 +444,12 @@
 	
 #if (CONSTANTS & CONST_SENSE)
 	if (sense_buffer[0] < 15)
-	    printk("%s%x: old sense key %s\n", devclass, dev, snstext[sense_buffer[0] & 0x0f]);
+	    printk("%s%s: old sense key %s\n", devclass,
+	      kdevname(SCpnt->request.rq_dev), snstext[sense_buffer[0] & 0x0f]);
 	else
 #endif
-	    printk("%s%x: sns = %2x %2x\n", devclass, dev, sense_buffer[0], sense_buffer[2]);
+	    printk("%s%s: sns = %2x %2x\n", devclass,
+	      kdevname(SCpnt->request.rq_dev), sense_buffer[0], sense_buffer[2]);
 	
 	printk("Non-extended sense class %d code 0x%0x ", sense_class, code);
 	s = 4;