Skip to content

Commit

Permalink
[SCSI] tmscsim: Move 'last_reset' into host structure
Browse files Browse the repository at this point in the history
The 'last_reset' value is only used internally, so move it into
the internal host structure.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
  • Loading branch information
Hannes Reinecke authored and James Bottomley committed Oct 25, 2013
1 parent 50d14a7 commit f274a02
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/scsi/tmscsim.c
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ dc390_StartSCSI( struct dc390_acb* pACB, struct dc390_dcb* pDCB, struct dc390_sr
pACB->SelConn++;
return 1;
}
if (time_before (jiffies, pACB->pScsiHost->last_reset))
if (time_before (jiffies, pACB->last_reset))
{
DEBUG0(printk ("DC390: We were just reset and don't accept commands yet!\n"));
return 1;
Expand Down Expand Up @@ -1863,7 +1863,7 @@ dc390_ScsiRstDetect( struct dc390_acb* pACB )
/* delay half a second */
udelay (1000);
DC390_write8 (ScsiCmd, CLEAR_FIFO_CMD);
pACB->pScsiHost->last_reset = jiffies + 5*HZ/2
pACB->last_reset = jiffies + 5*HZ/2
+ HZ * dc390_eepromBuf[pACB->AdapterIndex][EE_DELAY];
pACB->Connected = 0;

Expand Down Expand Up @@ -2048,9 +2048,9 @@ static int DC390_bus_reset (struct scsi_cmnd *cmd)

dc390_ResetDevParam(pACB);
mdelay(1);
pACB->pScsiHost->last_reset = jiffies + 3*HZ/2
pACB->last_reset = jiffies + 3*HZ/2
+ HZ * dc390_eepromBuf[pACB->AdapterIndex][EE_DELAY];

DC390_write8(ScsiCmd, CLEAR_FIFO_CMD);
DC390_read8(INT_Status); /* Reset Pending INT */

Expand Down Expand Up @@ -2383,7 +2383,7 @@ static void dc390_init_hw(struct dc390_acb *pACB, u8 index)
if (pACB->Gmode2 & RST_SCSI_BUS) {
dc390_ResetSCSIBus(pACB);
udelay(1000);
shost->last_reset = jiffies + HZ/2 +
pACB->last_reset = jiffies + HZ/2 +
HZ * dc390_eepromBuf[pACB->AdapterIndex][EE_DELAY];
}

Expand Down Expand Up @@ -2455,8 +2455,8 @@ static int dc390_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
shost->irq = pdev->irq;
shost->base = io_port;
shost->unique_id = io_port;
shost->last_reset = jiffies;


pACB->last_reset = jiffies;
pACB->pScsiHost = shost;
pACB->IOPortBase = (u16) io_port;
pACB->IRQLevel = pdev->irq;
Expand Down
1 change: 1 addition & 0 deletions drivers/scsi/tmscsim.h
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ u8 Ignore_IRQ; /* Not used */

struct pci_dev *pdev;

unsigned long last_reset;
unsigned long Cmds;
u32 SelLost;
u32 SelConn;
Expand Down

0 comments on commit f274a02

Please sign in to comment.