Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cd049a5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley
Browse files

[SCSI] remove cmd->serial_number litter 



Stop using cmd->serial_number in printks.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent f04ca1b6

drivers/message/i2o/i2o_scsi.c

+2 −2
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static int i2o_scsi_reply(struct i2o_controller *c, u32 m, 
	 */

	error = le32_to_cpu(msg->body[0]);



	osm_debug("Completed %ld\n", cmd->serial_number);

	osm_debug("Completed %0x%p\n", cmd);



	cmd->result = error & 0xff;

	/*
@@ -678,7 +678,7 @@ static int i2o_scsi_queuecommand_lck(struct scsi_cmnd *SCpnt, 
	/* Queue the message */

	i2o_msg_post(c, msg);



	osm_debug("Issued %ld\n", SCpnt->serial_number);

	osm_debug("Issued %0x%p\n", SCpnt);



	return 0;

drivers/scsi/dc395x.c

+96 −97

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/dpt_i2o.c

+3 −3
Original line number Diff line number Diff line
@@ -780,7 +780,7 @@ static int adpt_abort(struct scsi_cmnd * cmd) 
		return FAILED;

	}

	pHba = (adpt_hba*) cmd->device->host->hostdata[0];

	printk(KERN_INFO"%s: Trying to Abort cmd=%ld\n",pHba->name, cmd->serial_number);

	printk(KERN_INFO"%s: Trying to Abort\n",pHba->name);

	if ((dptdevice = (void*) (cmd->device->hostdata)) == NULL) {

		printk(KERN_ERR "%s: Unable to abort: No device in cmnd\n",pHba->name);

		return FAILED;
@@ -802,10 +802,10 @@ static int adpt_abort(struct scsi_cmnd * cmd) 
			printk(KERN_INFO"%s: Abort cmd not supported\n",pHba->name);

			return FAILED;

		}

		printk(KERN_INFO"%s: Abort cmd=%ld failed.\n",pHba->name, cmd->serial_number);

		printk(KERN_INFO"%s: Abort failed.\n",pHba->name);

		return FAILED;

	} 

	printk(KERN_INFO"%s: Abort cmd=%ld complete.\n",pHba->name, cmd->serial_number);

	printk(KERN_INFO"%s: Abort complete.\n",pHba->name);

	return SUCCESS;

}

drivers/scsi/eata.c

+31 −35

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/eata_pio.c

+8 −11
Original line number Diff line number Diff line
@@ -372,8 +372,7 @@ static int eata_pio_queue_lck(struct scsi_cmnd *cmd, 
	cp->status = USED;	/* claim free slot */



	DBG(DBG_QUEUE, scmd_printk(KERN_DEBUG, cmd,

		"eata_pio_queue pid %ld, y %d\n",

		cmd->serial_number, y));

		"eata_pio_queue 0x%p, y %d\n", cmd, y));



	cmd->scsi_done = (void *) done;
@@ -417,8 +416,8 @@ static int eata_pio_queue_lck(struct scsi_cmnd *cmd, 
	if (eata_pio_send_command(base, EATA_CMD_PIO_SEND_CP)) {

		cmd->result = DID_BUS_BUSY << 16;

		scmd_printk(KERN_NOTICE, cmd,

			"eata_pio_queue pid %ld, HBA busy, "

			"returning DID_BUS_BUSY, done.\n", cmd->serial_number);

			"eata_pio_queue pid 0x%p, HBA busy, "

			"returning DID_BUS_BUSY, done.\n", cmd);

		done(cmd);

		cp->status = FREE;

		return 0;
@@ -432,8 +431,8 @@ static int eata_pio_queue_lck(struct scsi_cmnd *cmd, 
		outw(0, base + HA_RDATA);



	DBG(DBG_QUEUE, scmd_printk(KERN_DEBUG, cmd,

		"Queued base %#.4lx pid: %ld "

		"slot %d irq %d\n", sh->base, cmd->serial_number, y, sh->irq));

		"Queued base %#.4lx cmd: 0x%p "

		"slot %d irq %d\n", sh->base, cmd, y, sh->irq));



	return 0;

}
@@ -445,8 +444,7 @@ static int eata_pio_abort(struct scsi_cmnd *cmd) 
	unsigned int loop = 100;



	DBG(DBG_ABNORM, scmd_printk(KERN_WARNING, cmd,

		"eata_pio_abort called pid: %ld\n",

		cmd->serial_number));

		"eata_pio_abort called pid: 0x%p\n", cmd));



	while (inb(cmd->device->host->base + HA_RAUXSTAT) & HA_ABUSY)

		if (--loop == 0) {
@@ -481,8 +479,7 @@ static int eata_pio_host_reset(struct scsi_cmnd *cmd) 
	struct Scsi_Host *host = cmd->device->host;



	DBG(DBG_ABNORM, scmd_printk(KERN_WARNING, cmd,

		"eata_pio_reset called pid:%ld\n",

		cmd->serial_number));

		"eata_pio_reset called\n"));



	spin_lock_irq(host->host_lock);
@@ -501,7 +498,7 @@ static int eata_pio_host_reset(struct scsi_cmnd *cmd) 


		sp = HD(cmd)->ccb[x].cmd;

		HD(cmd)->ccb[x].status = RESET;

		printk(KERN_WARNING "eata_pio_reset: slot %d in reset, pid %ld.\n", x, sp->serial_number);

		printk(KERN_WARNING "eata_pio_reset: slot %d in reset.\n", x);



		if (sp == NULL)

			panic("eata_pio_reset: slot %d, sp==NULL.\n", x);