1 files changed, 3 insertions, 11 deletions

diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index 5c6a8703f535..9570612b80ce 100644
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -400,16 +400,13 @@ int aac_rx_deliver_producer(struct fib * fib)
 {
         struct aac_dev *dev = fib->dev;
         struct aac_queue *q = &dev->queues->queue[AdapNormCmdQueue];
-        unsigned long qflags;
         u32 Index;
         unsigned long nointr = 0;
 
-        spin_lock_irqsave(q->lock, qflags);
         aac_queue_get( dev, &Index, AdapNormCmdQueue, fib->hw_fib_va, 1, fib, &nointr);
 
-        q->numpending++;
+        atomic_inc(&q->numpending);
         *(q->headers.producer) = cpu_to_le32(Index + 1);
-        spin_unlock_irqrestore(q->lock, qflags);
         if (!(nointr & aac_config.irq_mod))
                 aac_adapter_notify(dev, AdapNormCmdQueue);
 
@@ -426,15 +423,12 @@ static int aac_rx_deliver_message(struct fib * fib)
 {
         struct aac_dev *dev = fib->dev;
         struct aac_queue *q = &dev->queues->queue[AdapNormCmdQueue];
-        unsigned long qflags;
         u32 Index;
         u64 addr;
         volatile void __iomem *device;
 
         unsigned long count = 10000000L; /* 50 seconds */
-        spin_lock_irqsave(q->lock, qflags);
-        q->numpending++;
-        spin_unlock_irqrestore(q->lock, qflags);
+        atomic_inc(&q->numpending);
         for(;;) {
                 Index = rx_readl(dev, MUnit.InboundQueue);
                 if (unlikely(Index == 0xFFFFFFFFL))
@@ -442,9 +436,7 @@ static int aac_rx_deliver_message(struct fib * fib)
                 if (likely(Index != 0xFFFFFFFFL))
                         break;
                 if (--count == 0) {
-                        spin_lock_irqsave(q->lock, qflags);
-                        q->numpending--;
-                        spin_unlock_irqrestore(q->lock, qflags);
+                        atomic_dec(&q->numpending);
                         return -ETIMEDOUT;
                 }
                 udelay(5);