]> Pileus Git - ~andy/linux/commitdiff
mtip32xx: Use plain spinlock for 'cmd_issue_lock'
authorAsai Thambi S P <asamymuthupa@micron.com>
Wed, 30 May 2012 01:43:16 +0000 (18:43 -0700)
committerJens Axboe <axboe@kernel.dk>
Thu, 31 May 2012 06:46:50 +0000 (08:46 +0200)
'cmd_issue_lock' is for only acquiring a free slot, and it is not used
in interrupt context. So replaced irq version with non-irq version of spinlock.

Signed-off-by: Asai Thambi S P <asamymuthupa@micron.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/mtip32xx/mtip32xx.c

index 07cc07febbe17384560847c017bac9d834fb30a3..bfee50d1b31919afd33f770d5ba776a9e3eba105 100644 (file)
@@ -294,18 +294,16 @@ static int hba_reset_nosleep(struct driver_data *dd)
  */
 static inline void mtip_issue_ncq_command(struct mtip_port *port, int tag)
 {
-       unsigned long flags = 0;
-
        atomic_set(&port->commands[tag].active, 1);
 
-       spin_lock_irqsave(&port->cmd_issue_lock, flags);
+       spin_lock(&port->cmd_issue_lock);
 
        writel((1 << MTIP_TAG_BIT(tag)),
                        port->s_active[MTIP_TAG_INDEX(tag)]);
        writel((1 << MTIP_TAG_BIT(tag)),
                        port->cmd_issue[MTIP_TAG_INDEX(tag)]);
 
-       spin_unlock_irqrestore(&port->cmd_issue_lock, flags);
+       spin_unlock(&port->cmd_issue_lock);
 
        /* Set the command's timeout value.*/
        port->commands[tag].comp_time = jiffies + msecs_to_jiffies(