Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e544d704 authored by Finn Thain's avatar Finn Thain Committed by James Bottomley
Browse files

[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: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 0599f8f3

drivers/scsi/mac_esp.c

+0 −9
Original line number Diff line number Diff line
@@ -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)