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

Commit 4dde8f7d authored by Finn Thain's avatar Finn Thain Committed by Christoph Hellwig
Browse files

scsi/NCR5380: fix build failures when debugging is enabled 



The change from cmd->target to cmd->device->id was apparently the purpose of
commit a7f251228390e87d86c5e3846f99a455517fdd8e in
kernel/git/tglx/history.git but some instances have been missed.

Also fix the "NDEBUG_LAST_WRITE_SENT" and "NDEBUG_ALL" typo's.

Also fix some format strings (%ul becomes %lu) that caused compiler warnings.

Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Acked-by: default avatarSam Creasey <sammy@sammy.net>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent d614f068

drivers/scsi/NCR5380.c

+7 −7
Original line number Diff line number Diff line
@@ -1046,7 +1046,7 @@ static void NCR5380_main(struct work_struct *work) 
			for (tmp = (Scsi_Cmnd *) hostdata->issue_queue, prev = NULL; tmp; prev = tmp, tmp = (Scsi_Cmnd *) tmp->host_scribble) 

			{

				if (prev != tmp)

					dprintk(NDEBUG_LISTS, ("MAIN tmp=%p   target=%d   busy=%d lun=%d\n", tmp, tmp->target, hostdata->busy[tmp->target], tmp->lun));

					dprintk(NDEBUG_LISTS, ("MAIN tmp=%p   target=%d   busy=%d lun=%d\n", tmp, tmp->device->id, hostdata->busy[tmp->device->id], tmp->device->lun));

				/*  When we find one, remove it from the issue queue. */

				if (!(hostdata->busy[tmp->device->id] & (1 << tmp->device->lun))) {

					if (prev) {
@@ -1064,7 +1064,7 @@ static void NCR5380_main(struct work_struct *work) 
					 * On failure, we must add the command back to the

					 *   issue queue so we can keep trying. 

					 */

					dprintk(NDEBUG_MAIN|NDEBUG_QUEUES, ("scsi%d : main() : command for target %d lun %d removed from issue_queue\n", instance->host_no, tmp->target, tmp->lun));

					dprintk(NDEBUG_MAIN|NDEBUG_QUEUES, ("scsi%d : main() : command for target %d lun %d removed from issue_queue\n", instance->host_no, tmp->device->id, tmp->device->lun));

	

					/*

					 * A successful selection is defined as one that
@@ -2028,7 +2028,7 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase 
					hostdata->flags &= ~FLAG_CHECK_LAST_BYTE_SENT;

					if (NCR5380_read(TARGET_COMMAND_REG) & TCR_LAST_BYTE_SENT) {

						hostdata->flags |= FLAG_HAS_LAST_BYTE_SENT;

						dprintk(NDEBUG_LAST_WRITE_SENT, ("scsi%d : last bit sent works\n", instance->host_no));

						dprintk(NDEBUG_LAST_BYTE_SENT, ("scsi%d : last byte sent works\n", instance->host_no));

					}

				}

			} else {
@@ -2454,7 +2454,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { 
				NCR5380_transfer_pio(instance, &phase, &len, &data);

				if (!cmd->device->disconnect && should_disconnect(cmd->cmnd[0])) {

					NCR5380_set_timer(hostdata, USLEEP_SLEEP);

					dprintk(NDEBUG_USLEEP, ("scsi%d : issued command, sleeping until %ul\n", instance->host_no, hostdata->time_expires));

					dprintk(NDEBUG_USLEEP, ("scsi%d : issued command, sleeping until %lu\n", instance->host_no, hostdata->time_expires));

					return;

				}

				break;
@@ -2466,7 +2466,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { 
				break;

			default:

				printk("scsi%d : unknown phase\n", instance->host_no);

				NCR5380_dprint(NDEBUG_ALL, instance);

				NCR5380_dprint(NDEBUG_ANY, instance);

			}	/* switch(phase) */

		}		/* if (tmp * SR_REQ) */

		else {
@@ -2474,7 +2474,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { 
			 */

			if (!cmd->device->disconnect && time_after_eq(jiffies, poll_time)) {

				NCR5380_set_timer(hostdata, USLEEP_SLEEP);

				dprintk(NDEBUG_USLEEP, ("scsi%d : poll timed out, sleeping until %ul\n", instance->host_no, hostdata->time_expires));

				dprintk(NDEBUG_USLEEP, ("scsi%d : poll timed out, sleeping until %lu\n", instance->host_no, hostdata->time_expires));

				return;

			}

		}
@@ -2595,7 +2595,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance) { 
		do_abort(instance);

	} else {

		hostdata->connected = tmp;

		dprintk(NDEBUG_RESELECTION, ("scsi%d : nexus established, target = %d, lun = %d, tag = %d\n", instance->host_no, tmp->target, tmp->lun, tmp->tag));

		dprintk(NDEBUG_RESELECTION, ("scsi%d : nexus established, target = %d, lun = %d, tag = %d\n", instance->host_no, tmp->device->id, tmp->device->lun, tmp->tag));

	}

}

drivers/scsi/sun3_NCR5380.c

+2 −2
Original line number Diff line number Diff line
@@ -1049,7 +1049,7 @@ static void NCR5380_main (struct work_struct *bl) 
		     */

		    MAIN_PRINTK("scsi%d: main(): command for target %d "

				"lun %d removed from issue_queue\n",

				HOSTNO, tmp->target, tmp->lun);

				HOSTNO, tmp->device->id, tmp->device->lun);

		    /* 

		     * REQUEST SENSE commands are issued without tagged

		     * queueing, even on SCSI-II devices because the
@@ -2587,7 +2587,7 @@ static void NCR5380_reselect (struct Scsi_Host *instance) 
    

    hostdata->connected = tmp;

    RSL_PRINTK("scsi%d: nexus established, target = %d, lun = %d, tag = %d\n",

	       HOSTNO, tmp->target, tmp->lun, tmp->tag);

	       HOSTNO, tmp->device->id, tmp->device->lun, tmp->tag);

}