Replaced calls with save_flags()/cli() pair with
spi_lock_irqsave()/spin_unlock_irqrestore()
Tested:
1. compilation only
2. Code review to verify that the change does not result in a recursive
locking
Signed-off-by: Amol Lad <[email protected]>
---
Andrew,
Please add this to -mm
---
--- linux-2.6.19-rc4-orig/drivers/scsi/mca_53c9x.c 2006-08-24 02:46:33.000000000 +0530
+++ linux-2.6.19-rc4/drivers/scsi/mca_53c9x.c 2006-11-06 18:03:22.000000000 +0530
@@ -341,9 +341,7 @@ static void dma_init_read(struct NCR_ESP
{
unsigned long flags;
-
- save_flags(flags);
- cli();
+ spin_lock_irqsave(esp->ehost->host_lock, flags);
mca_disable_dma(esp->dma);
mca_set_dma_mode(esp->dma, MCA_DMA_MODE_XFER | MCA_DMA_MODE_16 |
@@ -352,16 +350,14 @@ static void dma_init_read(struct NCR_ESP
mca_set_dma_count(esp->dma, length / 2); /* !!! */
mca_enable_dma(esp->dma);
- restore_flags(flags);
+ spin_unlock_irqrestore(esp->ehost->host_lock, flags);
}
static void dma_init_write(struct NCR_ESP *esp, __u32 addr, int length)
{
unsigned long flags;
-
- save_flags(flags);
- cli();
+ spin_lock_irqsave(esp->ehost->host_lock, flags);
mca_disable_dma(esp->dma);
mca_set_dma_mode(esp->dma, MCA_DMA_MODE_XFER | MCA_DMA_MODE_WRITE |
@@ -370,7 +366,7 @@ static void dma_init_write(struct NCR_ES
mca_set_dma_count(esp->dma, length / 2); /* !!! */
mca_enable_dma(esp->dma);
- restore_flags(flags);
+ spin_unlock_irqrestore(esp->ehost->host_lock, flags);
}
static void dma_ints_off(struct NCR_ESP *esp)