diff options
author | Matthew Wilcox <matthew@wil.cx> | 2007-10-02 21:55:23 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-10-12 14:52:55 -0400 |
commit | 6e8905f4a028bd07190fa5b2f90b5a35868c84d8 (patch) | |
tree | 3ed2706026805af0ddf0f9c7df08a3d1a824b545 /drivers/scsi/advansys.c | |
parent | 512193588db0d38ae6aa78802bb15f3ef3104a00 (diff) |
[SCSI] advansys: Remove array of scsi targets
The driver was saving a scsi_device for each target, but wasn't doing
anything useful with them. Just delete the array.
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/advansys.c')
-rw-r--r-- | drivers/scsi/advansys.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index 4f047cc87c66..737c0e4b3190 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c | |||
@@ -2514,7 +2514,6 @@ typedef struct asc_board { | |||
2514 | } dvc_cfg; | 2514 | } dvc_cfg; |
2515 | ushort asc_n_io_port; /* Number I/O ports. */ | 2515 | ushort asc_n_io_port; /* Number I/O ports. */ |
2516 | ADV_SCSI_BIT_ID_TYPE init_tidmask; /* Target init./valid mask */ | 2516 | ADV_SCSI_BIT_ID_TYPE init_tidmask; /* Target init./valid mask */ |
2517 | struct scsi_device *device[ADV_MAX_TID + 1]; /* Mid-Level Scsi Device */ | ||
2518 | ushort reqcnt[ADV_MAX_TID + 1]; /* Starvation request count */ | 2517 | ushort reqcnt[ADV_MAX_TID + 1]; /* Starvation request count */ |
2519 | ADV_SCSI_BIT_ID_TYPE queue_full; /* Queue full mask */ | 2518 | ADV_SCSI_BIT_ID_TYPE queue_full; /* Queue full mask */ |
2520 | ushort queue_full_cnt[ADV_MAX_TID + 1]; /* Queue full count */ | 2519 | ushort queue_full_cnt[ADV_MAX_TID + 1]; /* Queue full count */ |
@@ -10183,13 +10182,6 @@ static int advansys_slave_configure(struct scsi_device *sdev) | |||
10183 | asc_board_t *boardp = ASC_BOARDP(sdev->host); | 10182 | asc_board_t *boardp = ASC_BOARDP(sdev->host); |
10184 | boardp->flags |= ASC_SELECT_QUEUE_DEPTHS; | 10183 | boardp->flags |= ASC_SELECT_QUEUE_DEPTHS; |
10185 | 10184 | ||
10186 | /* | ||
10187 | * Save a pointer to the sdev and set its initial/maximum | ||
10188 | * queue depth. Only save the pointer for a lun0 dev though. | ||
10189 | */ | ||
10190 | if (sdev->lun == 0) | ||
10191 | boardp->device[sdev->id] = sdev; | ||
10192 | |||
10193 | if (ASC_NARROW_BOARD(boardp)) | 10185 | if (ASC_NARROW_BOARD(boardp)) |
10194 | advansys_narrow_slave_configure(sdev, | 10186 | advansys_narrow_slave_configure(sdev, |
10195 | &boardp->dvc_var.asc_dvc_var); | 10187 | &boardp->dvc_var.asc_dvc_var); |
@@ -11343,14 +11335,12 @@ static int asc_execute_scsi_cmnd(struct scsi_cmnd *scp) | |||
11343 | ASC_DVC_VAR *asc_dvc_varp; | 11335 | ASC_DVC_VAR *asc_dvc_varp; |
11344 | ADV_DVC_VAR *adv_dvc_varp; | 11336 | ADV_DVC_VAR *adv_dvc_varp; |
11345 | ADV_SCSI_REQ_Q *adv_scsiqp; | 11337 | ADV_SCSI_REQ_Q *adv_scsiqp; |
11346 | struct scsi_device *device; | ||
11347 | int ret; | 11338 | int ret; |
11348 | 11339 | ||
11349 | ASC_DBG2(1, "asc_execute_scsi_cmnd: scp 0x%lx, done 0x%lx\n", | 11340 | ASC_DBG2(1, "asc_execute_scsi_cmnd: scp 0x%lx, done 0x%lx\n", |
11350 | (ulong)scp, (ulong)scp->scsi_done); | 11341 | (ulong)scp, (ulong)scp->scsi_done); |
11351 | 11342 | ||
11352 | boardp = ASC_BOARDP(scp->device->host); | 11343 | boardp = ASC_BOARDP(scp->device->host); |
11353 | device = boardp->device[scp->device->id]; | ||
11354 | 11344 | ||
11355 | if (ASC_NARROW_BOARD(boardp)) { | 11345 | if (ASC_NARROW_BOARD(boardp)) { |
11356 | /* | 11346 | /* |