Re: [PATCH] drivers/scsi/mca_53c9x.c : save_flags()/cli() removal

[Andrew Morton]

On Mon, 06 Nov 2006 18:12:11 +0530
Amol Lad <amol@xxxxxxxxxxxxxxxxxxx> wrote:

> Replaced save_flags()/cli() with spin_lock alternatives
> 
> Signed-off-by: Amol Lad <amol@xxxxxxxxxxxxxxxxxxx>
> ---
> 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)

hm.  How do we find out if this works?

If it _does_ work then we can now remove the Kconfig BROKEN_ON_SMP dependency
for this driver.

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/