diff options
author | Finn Thain <fthain@telegraphics.com.au> | 2011-09-11 05:57:51 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2011-09-22 07:10:18 -0400 |
commit | e544d704f9bea6892808e453e219aa305bc0269a (patch) | |
tree | b4efe460d420926ea31bb61f487ef8e2066ef3ae /drivers/scsi/mac_esp.c | |
parent | 0599f8f37ee9d2f44bd79b6f66f9f46ba6514ace (diff) |
[SCSI] mac_esp: remove redundant mutual exclusion
Mutual exclusion is redundant here because all the paths in the call graph
leading to esp_driver_ops.send_dma_cmd() happen under spin_lock_irqsave/
spin_lock_irqrestore. Remove it.
Tested on a Mac Quadra 660av and a Mac LC 630.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/mac_esp.c')
-rw-r--r-- | drivers/scsi/mac_esp.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c index 3893337e3dd3..590ce1ef2016 100644 --- a/drivers/scsi/mac_esp.c +++ b/drivers/scsi/mac_esp.c | |||
@@ -230,9 +230,6 @@ static void mac_esp_send_pdma_cmd(struct esp *esp, u32 addr, u32 esp_count, | |||
230 | u32 dma_count, int write, u8 cmd) | 230 | u32 dma_count, int write, u8 cmd) |
231 | { | 231 | { |
232 | struct mac_esp_priv *mep = MAC_ESP_GET_PRIV(esp); | 232 | struct mac_esp_priv *mep = MAC_ESP_GET_PRIV(esp); |
233 | unsigned long flags; | ||
234 | |||
235 | local_irq_save(flags); | ||
236 | 233 | ||
237 | mep->error = 0; | 234 | mep->error = 0; |
238 | 235 | ||
@@ -270,8 +267,6 @@ static void mac_esp_send_pdma_cmd(struct esp *esp, u32 addr, u32 esp_count, | |||
270 | esp_count = n; | 267 | esp_count = n; |
271 | } | 268 | } |
272 | } while (esp_count); | 269 | } while (esp_count); |
273 | |||
274 | local_irq_restore(flags); | ||
275 | } | 270 | } |
276 | 271 | ||
277 | /* | 272 | /* |
@@ -353,8 +348,6 @@ static void mac_esp_send_pio_cmd(struct esp *esp, u32 addr, u32 esp_count, | |||
353 | struct mac_esp_priv *mep = MAC_ESP_GET_PRIV(esp); | 348 | struct mac_esp_priv *mep = MAC_ESP_GET_PRIV(esp); |
354 | u8 *fifo = esp->regs + ESP_FDATA * 16; | 349 | u8 *fifo = esp->regs + ESP_FDATA * 16; |
355 | 350 | ||
356 | disable_irq(esp->host->irq); | ||
357 | |||
358 | cmd &= ~ESP_CMD_DMA; | 351 | cmd &= ~ESP_CMD_DMA; |
359 | mep->error = 0; | 352 | mep->error = 0; |
360 | 353 | ||
@@ -431,8 +424,6 @@ static void mac_esp_send_pio_cmd(struct esp *esp, u32 addr, u32 esp_count, | |||
431 | scsi_esp_cmd(esp, ESP_CMD_TI); | 424 | scsi_esp_cmd(esp, ESP_CMD_TI); |
432 | } | 425 | } |
433 | } | 426 | } |
434 | |||
435 | enable_irq(esp->host->irq); | ||
436 | } | 427 | } |
437 | 428 | ||
438 | static int mac_esp_irq_pending(struct esp *esp) | 429 | static int mac_esp_irq_pending(struct esp *esp) |