From b07cb5882af1ec3892bbe40d0dd8bfd03230b8a9 Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Tue, 2 Oct 2007 21:55:23 -0400 Subject: [PATCH] --- yaml --- r: 68956 b: refs/heads/master c: 6e8905f4a028bd07190fa5b2f90b5a35868c84d8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/advansys.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index c327c530abde..b45b97e84cf5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 512193588db0d38ae6aa78802bb15f3ef3104a00 +refs/heads/master: 6e8905f4a028bd07190fa5b2f90b5a35868c84d8 diff --git a/trunk/drivers/scsi/advansys.c b/trunk/drivers/scsi/advansys.c index 4f047cc87c66..737c0e4b3190 100644 --- a/trunk/drivers/scsi/advansys.c +++ b/trunk/drivers/scsi/advansys.c @@ -2514,7 +2514,6 @@ typedef struct asc_board { } dvc_cfg; ushort asc_n_io_port; /* Number I/O ports. */ ADV_SCSI_BIT_ID_TYPE init_tidmask; /* Target init./valid mask */ - struct scsi_device *device[ADV_MAX_TID + 1]; /* Mid-Level Scsi Device */ ushort reqcnt[ADV_MAX_TID + 1]; /* Starvation request count */ ADV_SCSI_BIT_ID_TYPE queue_full; /* Queue full mask */ ushort queue_full_cnt[ADV_MAX_TID + 1]; /* Queue full count */ @@ -10183,13 +10182,6 @@ static int advansys_slave_configure(struct scsi_device *sdev) asc_board_t *boardp = ASC_BOARDP(sdev->host); boardp->flags |= ASC_SELECT_QUEUE_DEPTHS; - /* - * Save a pointer to the sdev and set its initial/maximum - * queue depth. Only save the pointer for a lun0 dev though. - */ - if (sdev->lun == 0) - boardp->device[sdev->id] = sdev; - if (ASC_NARROW_BOARD(boardp)) advansys_narrow_slave_configure(sdev, &boardp->dvc_var.asc_dvc_var); @@ -11343,14 +11335,12 @@ static int asc_execute_scsi_cmnd(struct scsi_cmnd *scp) ASC_DVC_VAR *asc_dvc_varp; ADV_DVC_VAR *adv_dvc_varp; ADV_SCSI_REQ_Q *adv_scsiqp; - struct scsi_device *device; int ret; ASC_DBG2(1, "asc_execute_scsi_cmnd: scp 0x%lx, done 0x%lx\n", (ulong)scp, (ulong)scp->scsi_done); boardp = ASC_BOARDP(scp->device->host); - device = boardp->device[scp->device->id]; if (ASC_NARROW_BOARD(boardp)) { /*