[PATCH] uses of ->rq_dev in printks

	* killed the uses of ->rq_dev in printks - several drivers.

drivers/ide/ide-floppy.c

@@ -1263,8 +1263,8 @@ static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, struct request
 	unsigned long block = (unsigned long)block_s;
 
 #if IDEFLOPPY_DEBUG_LOG
-	printk(KERN_INFO "rq_status: %d, rq_dev: %u, flags: %lx, errors: %d\n",
-			rq->rq_status, (unsigned int) rq->rq_dev,
+	printk(KERN_INFO "rq_status: %d, dev: %s, flags: %lx, errors: %d\n",
+			rq->rq_status, rq->rq_disk->disk_name,
 			rq->flags, rq->errors);
 	printk(KERN_INFO "sector: %ld, nr_sectors: %ld, "
 			"current_nr_sectors: %ld\n", (long)rq->sector,

drivers/ide/ide-tape.c

@@ -2591,8 +2591,8 @@ static ide_startstop_t idetape_do_request (ide_drive_t *drive, struct request *r
 #if 0
 	if (tape->debug_level >= 5)
 		printk(KERN_INFO "ide-tape: rq_status: %d, "
-			"rq_dev: %u, cmd: %ld, errors: %d\n", rq->rq_status,
-			(unsigned int) rq->rq_dev, rq->flags, rq->errors);
+			"dev: %s, cmd: %ld, errors: %d\n", rq->rq_status,
+			 rq->rq_disk->disk_name, rq->flags, rq->errors);
 #endif
 	if (tape->debug_level >= 2)
 		printk(KERN_INFO "ide-tape: sector: %ld, "

drivers/scsi/aha1542.c

@@ -1635,14 +1635,18 @@ static int aha1542_old_abort(Scsi_Cmnd * SCpnt)
 		if (HOSTDATA(SCpnt->host)->SCint[i]) {
 			if (HOSTDATA(SCpnt->host)->SCint[i] == SCpnt) {
 				printk(KERN_ERR "Timed out command pending for %s\n",
-				       kdevname(SCpnt->request->rq_dev));
+				       SCpnt->request->rq_disk ?
+				       SCpnt->request->rq_disk->disk_name : "?"
+				       );
 				if (HOSTDATA(SCpnt->host)->mb[i].status) {
 					printk(KERN_ERR "OGMB still full - restarting\n");
 					aha1542_out(SCpnt->host->io_port, &ahacmd, 1);
 				};
 			} else
 				printk(KERN_ERR "Other pending command %s\n",
-				       kdevname(SCpnt->request->rq_dev));
+				       SCpnt->request->rq_disk ?
+				       SCpnt->request->rq_disk->disk_name : "?"
+				       );
 		}
 #endif
 

drivers/scsi/constants.c

@@ -905,12 +905,13 @@ scsi_show_extd_sense(unsigned char asc, unsigned char ascq) {
 static void
 print_sense_internal(const char * devclass, 
 		     const unsigned char * sense_buffer,
-		     kdev_t dev)
+		     struct request *req)
 {
 	int s, sense_class, valid, code, info;
 	const char * error = NULL;
 	unsigned char asc, ascq;
 	const char *sense_txt;
+	char *name = req->rq_disk ? req->rq_disk->disk_name : "?";
     
 	sense_class = (sense_buffer[0] >> 4) & 0x07;
 	code = sense_buffer[0] & 0xf;
@@ -954,10 +955,10 @@ print_sense_internal(const char * devclass,
 		sense_txt = scsi_sense_key_string(sense_buffer[2]);
 		if (sense_txt)
 			printk("%s%s: sense key %s\n",
-			       devclass, kdevname(dev), sense_txt);
+			       devclass, name, sense_txt);
 		else
 			printk("%s%s: sense = %2x %2x\n",
-			       devclass, kdevname(dev),
+			       devclass, name,
 			       sense_buffer[0], sense_buffer[2]);
 
 		asc = ascq = 0;
@@ -981,10 +982,10 @@ print_sense_internal(const char * devclass,
 		sense_txt = scsi_sense_key_string(sense_buffer[0]);
 		if (sense_txt)
 			printk("%s%s: old sense key %s\n",
-			       devclass, kdevname(dev), sense_txt);
+			       devclass, name, sense_txt);
 		else
 			printk("%s%s: sense = %2x %2x\n",
-			       devclass, kdevname(dev),
+			       devclass, name,
 			       sense_buffer[0], sense_buffer[2]);
 
 		printk("Non-extended sense class %d code 0x%0x\n",
@@ -1006,13 +1007,13 @@ print_sense_internal(const char * devclass,
 void print_sense(const char * devclass, Scsi_Cmnd * SCpnt)
 {
 	print_sense_internal(devclass, SCpnt->sense_buffer,
-			     SCpnt->request->rq_dev);
+			     SCpnt->request);
 }
 
 void print_req_sense(const char * devclass, Scsi_Request * SRpnt)
 {
 	print_sense_internal(devclass, SRpnt->sr_sense_buffer,
-			     SRpnt->sr_request->rq_dev);
+			     SRpnt->sr_request);
 }
 
 #if (CONSTANTS & CONST_MSG) 

drivers/scsi/ide-scsi.c

@@ -489,7 +489,7 @@ static ide_startstop_t idescsi_issue_pc (ide_drive_t *drive, idescsi_pc_t *pc)
 static ide_startstop_t idescsi_do_request (ide_drive_t *drive, struct request *rq, sector_t block)
 {
 #if IDESCSI_DEBUG_LOG
-	printk (KERN_INFO "rq_status: %d, rq_dev: %u, cmd: %d, errors: %d\n",rq->rq_status,(unsigned int) rq->rq_dev,rq->cmd,rq->errors);
+	printk (KERN_INFO "rq_status: %d, dev: %s, cmd: %d, errors: %d\n",rq->rq_status, rq->rq_disk->disk_name,rq->cmd,rq->errors);
 	printk (KERN_INFO "sector: %ld, nr_sectors: %ld, current_nr_sectors: %ld\n",rq->sector,rq->nr_sectors,rq->current_nr_sectors);
 #endif /* IDESCSI_DEBUG_LOG */
 

drivers/scsi/scsi.c

@@ -2171,7 +2171,8 @@ static void scsi_dump_status(int level)
                                        SCpnt->target,
                                        SCpnt->lun,
 
-                                       kdevname(SCpnt->request->rq_dev),
+                                       SCpnt->request->rq_disk ?
+                                       SCpnt->request->rq_disk->disk_name : "?",
                                        (unsigned long long)SCpnt->request->sector,
 				       SCpnt->request->nr_sectors,
 				       (long)SCpnt->request->current_nr_sectors,