diff options
author | Asai Thambi S P <asamymuthupa@micron.com> | 2012-05-29 21:43:16 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2012-05-31 02:46:50 -0400 |
commit | 0a07ab224afc56c497e2f1c48e853dbdf964d549 (patch) | |
tree | 1bde0fec2ac58848d86fd64d465401d54a0e9323 /drivers/block | |
parent | 6c8ab69818e9469c864eea7d47c3d1c36ecd1e95 (diff) |
mtip32xx: Use plain spinlock for 'cmd_issue_lock'
'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>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/mtip32xx/mtip32xx.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c index 07cc07febbe1..bfee50d1b319 100644 --- a/drivers/block/mtip32xx/mtip32xx.c +++ b/drivers/block/mtip32xx/mtip32xx.c | |||
@@ -294,18 +294,16 @@ static int hba_reset_nosleep(struct driver_data *dd) | |||
294 | */ | 294 | */ |
295 | static inline void mtip_issue_ncq_command(struct mtip_port *port, int tag) | 295 | static inline void mtip_issue_ncq_command(struct mtip_port *port, int tag) |
296 | { | 296 | { |
297 | unsigned long flags = 0; | ||
298 | |||
299 | atomic_set(&port->commands[tag].active, 1); | 297 | atomic_set(&port->commands[tag].active, 1); |
300 | 298 | ||
301 | spin_lock_irqsave(&port->cmd_issue_lock, flags); | 299 | spin_lock(&port->cmd_issue_lock); |
302 | 300 | ||
303 | writel((1 << MTIP_TAG_BIT(tag)), | 301 | writel((1 << MTIP_TAG_BIT(tag)), |
304 | port->s_active[MTIP_TAG_INDEX(tag)]); | 302 | port->s_active[MTIP_TAG_INDEX(tag)]); |
305 | writel((1 << MTIP_TAG_BIT(tag)), | 303 | writel((1 << MTIP_TAG_BIT(tag)), |
306 | port->cmd_issue[MTIP_TAG_INDEX(tag)]); | 304 | port->cmd_issue[MTIP_TAG_INDEX(tag)]); |
307 | 305 | ||
308 | spin_unlock_irqrestore(&port->cmd_issue_lock, flags); | 306 | spin_unlock(&port->cmd_issue_lock); |
309 | 307 | ||
310 | /* Set the command's timeout value.*/ | 308 | /* Set the command's timeout value.*/ |
311 | port->commands[tag].comp_time = jiffies + msecs_to_jiffies( | 309 | port->commands[tag].comp_time = jiffies + msecs_to_jiffies( |