]> err.no Git - linux-2.6/commitdiff
[SCSI] advansys: Remove array of scsi targets
authorMatthew Wilcox <matthew@wil.cx>
Wed, 3 Oct 2007 01:55:23 +0000 (21:55 -0400)
committerJames Bottomley <jejb@mulgrave.localdomain>
Fri, 12 Oct 2007 18:52:55 +0000 (14:52 -0400)
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>
drivers/scsi/advansys.c

index 4f047cc87c6639ae205377e7803b96e63eab1ce2..737c0e4b3190393d439c462e0782954212151185 100644 (file)
@@ -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)) {
                /*