[SCSI] advansys: Remove private lock

The board lock was essentially identical with the host lock.

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 6bd8e835ea0f769d65b2f6673d66c3f7c5be7317..a4091ab8d363d765519ff0efdb3c25adb39026fd 100644 (file)
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -2439,7 +2439,6 @@ struct asc_board {
                ADVEEP_38C1600_CONFIG adv_38C1600_eep;  /* 38C1600 EEPROM config. */
        } eep_config;
        ulong last_reset;       /* Saved last reset time */
-       spinlock_t lock;        /* Board spinlock */
        /* /proc/scsi/advansys/[0...] */
        char *prtbuf;           /* /proc print buffer */
 #ifdef ADVANSYS_STATS
@@ -9621,7 +9620,7 @@ static int advansys_reset(struct scsi_cmnd *scp)
                }
 
                ASC_DBG(1, "after AscInitAsc1000Driver()\n");
-               spin_lock_irqsave(&boardp->lock, flags);
+               spin_lock_irqsave(shost->host_lock, flags);
        } else {
                /*
                 * If the suggest reset bus flags are set, then reset the bus.
@@ -9644,13 +9643,13 @@ static int advansys_reset(struct scsi_cmnd *scp)
                        ret = FAILED;
                        break;
                }
-               spin_lock_irqsave(&boardp->lock, flags);
+               spin_lock_irqsave(shost->host_lock, flags);
                AdvISR(adv_dvc);
        }
 
        /* Save the time of the most recently completed reset. */
        boardp->last_reset = jiffies;
-       spin_unlock_irqrestore(&boardp->lock, flags);
+       spin_unlock_irqrestore(shost->host_lock, flags);
 
        ASC_DBG(1, "ret %d\n", ret);
 
@@ -9707,13 +9706,12 @@ advansys_biosparam(struct scsi_device *sdev, struct block_device *bdev,
  */
 static irqreturn_t advansys_interrupt(int irq, void *dev_id)
 {
-       unsigned long flags;
        struct Scsi_Host *shost = dev_id;
        struct asc_board *boardp = shost_priv(shost);
        irqreturn_t result = IRQ_NONE;
 
        ASC_DBG(2, "boardp 0x%p\n", boardp);
-       spin_lock_irqsave(&boardp->lock, flags);
+       spin_lock(shost->host_lock);
        if (ASC_NARROW_BOARD(boardp)) {
                if (AscIsIntPending(shost->io_port)) {
                        result = IRQ_HANDLED;
@@ -9728,7 +9726,7 @@ static irqreturn_t advansys_interrupt(int irq, void *dev_id)
                        ASC_STATS(shost, interrupt);
                }
        }
-       spin_unlock_irqrestore(&boardp->lock, flags);
+       spin_unlock(shost->host_lock);
 
        ASC_DBG(1, "end\n");
        return result;
@@ -11203,20 +11201,12 @@ static int
 advansys_queuecommand(struct scsi_cmnd *scp, void (*done)(struct scsi_cmnd *))
 {
        struct Scsi_Host *shost = scp->device->host;
-       struct asc_board *boardp = shost_priv(shost);
-       unsigned long flags;
        int asc_res, result = 0;
 
        ASC_STATS(shost, queuecommand);
        scp->scsi_done = done;
 
-       /*
-        * host_lock taken by mid-level prior to call, but need
-        * to protect against own ISR
-        */
-       spin_lock_irqsave(&boardp->lock, flags);
        asc_res = asc_execute_scsi_cmnd(scp);
-       spin_unlock_irqrestore(&boardp->lock, flags);
 
        switch (asc_res) {
        case ASC_NOERROR:
@@ -13633,7 +13623,6 @@ static int __devinit advansys_board_found(struct Scsi_Host *shost,
        int share_irq, warn_code, ret;
 
        boardp->id = asc_board_count++;
-       spin_lock_init(&boardp->lock);
        pdev = (bus_type == ASC_IS_PCI) ? to_pci_dev(boardp->dev) : NULL;
 
        if (ASC_NARROW_BOARD(boardp)) {