Commit 6b1e5a45 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by James Bottomley
Browse files

[SCSI] remove check for 'resetting' 



Field is now unused, so this is dead code.

[jejb: remove resetting and last_reset from Scsi_Host]
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 53a8936c

drivers/scsi/scsi.c

+0 −28
Original line number Diff line number Diff line
@@ -78,11 +78,6 @@ static void scsi_done(struct scsi_cmnd *cmd); 
 * Definitions and constants.

 */



#define MIN_RESET_DELAY (2*HZ)



/* Do not call reset on error if we just did a reset within 15 sec. */

#define MIN_RESET_PERIOD (15*HZ)



/*

 * Note - the initial logging level can be set here to log events at boot time.

 * After the system is up, you may enable logging via the /proc interface.
@@ -658,7 +653,6 @@ EXPORT_SYMBOL(scsi_cmd_get_serial); 
int scsi_dispatch_cmd(struct scsi_cmnd *cmd)

{

	struct Scsi_Host *host = cmd->device->host;

	unsigned long timeout;

	int rtn = 0;



	atomic_inc(&cmd->device->iorequest_cnt);
@@ -704,28 +698,6 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd) 
			       (cmd->device->lun << 5 & 0xe0);

	}



	/*

	 * We will wait MIN_RESET_DELAY clock ticks after the last reset so

	 * we can avoid the drive not being ready.

	 */

	timeout = host->last_reset + MIN_RESET_DELAY;



	if (host->resetting && time_before(jiffies, timeout)) {

		int ticks_remaining = timeout - jiffies;

		/*

		 * NOTE: This may be executed from within an interrupt

		 * handler!  This is bad, but for now, it'll do.  The irq

		 * level of the interrupt handler has been masked out by the

		 * platform dependent interrupt handling code already, so the

		 * sti() here will not cause another call to the SCSI host's

		 * interrupt handler (assuming there is one irq-level per

		 * host).

		 */

		while (--ticks_remaining >= 0)

			mdelay(1 + 999 / HZ);

		host->resetting = 0;

	}



	scsi_log_send(cmd);



	/*

include/scsi/scsi_host.h

+0 −2
Original line number Diff line number Diff line
@@ -598,8 +598,6 @@ struct Scsi_Host { 
	unsigned int host_eh_scheduled;    /* EH scheduled without command */

    

	unsigned int host_no;  /* Used for IOCTL_GET_IDLUN, /proc/scsi et al. */

	int resetting; /* if set, it means that last_reset is a valid value */

	unsigned long last_reset;



	/*

	 * These three parameters can be used to allow for wide scsi,