diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2011-09-11 19:57:51 +1000 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-09-22 15:10:18 +0400 |
| commit | e544d704f9bea6892808e453e219aa305bc0269a (patch) | |
| tree | b4efe460d420926ea31bb61f487ef8e2066ef3ae /drivers/scsi/mac_esp.c | |
| parent | 0599f8f37ee9d2f44bd79b6f66f9f46ba6514ace (diff) | |
| download | linux-e544d704f9bea6892808e453e219aa305bc0269a.tar.gz | |
[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, u32 dma_count, int write, u8 cmd) { struct mac_esp_priv *mep = MAC_ESP_GET_PRIV(esp); - unsigned long flags; - - local_irq_save(flags); mep->error = 0; @@ -270,8 +267,6 @@ static void mac_esp_send_pdma_cmd(struct esp *esp, u32 addr, u32 esp_count, esp_count = n; } } while (esp_count); - - local_irq_restore(flags); } /* @@ -353,8 +348,6 @@ static void mac_esp_send_pio_cmd(struct esp *esp, u32 addr, u32 esp_count, struct mac_esp_priv *mep = MAC_ESP_GET_PRIV(esp); u8 *fifo = esp->regs + ESP_FDATA * 16; - disable_irq(esp->host->irq); - cmd &= ~ESP_CMD_DMA; mep->error = 0; @@ -431,8 +424,6 @@ static void mac_esp_send_pio_cmd(struct esp *esp, u32 addr, u32 esp_count, scsi_esp_cmd(esp, ESP_CMD_TI); } } - - enable_irq(esp->host->irq); } static int mac_esp_irq_pending(struct esp *esp) |