Skip to content

Commit

Permalink
[SCSI] mac_esp: remove redundant mutual exclusion
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Finn Thain authored and James Bottomley committed Sep 22, 2011
1 parent 0599f8f commit e544d70
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions drivers/scsi/mac_esp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
}

/*
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit e544d70

Please sign in to comment.