Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161199AbWJPGqW (ORCPT ); Mon, 16 Oct 2006 02:46:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161197AbWJPGqW (ORCPT ); Mon, 16 Oct 2006 02:46:22 -0400 Received: from mail01.verismonetworks.com ([164.164.99.228]:29610 "EHLO mail01.verismonetworks.com") by vger.kernel.org with ESMTP id S1161199AbWJPGqV (ORCPT ); Mon, 16 Oct 2006 02:46:21 -0400 Subject: [PATCH] drivers/scsi/mca_53c9x.c: save_flags()/cli() removal From: Amol Lad To: linux kernel , James.Bottomley@steeleye.com Cc: kernel Janitors Content-Type: text/plain Date: Mon, 16 Oct 2006 12:19:42 +0530 Message-Id: <1160981382.19143.416.camel@amol.verismonetworks.com> Mime-Version: 1.0 X-Mailer: Evolution 2.2.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1915 Lines: 64 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 --- James, Though I have done the review to check for recursive locking, can you also have a look ? --- --- linux-2.6.19-rc1-orig/drivers/scsi/mca_53c9x.c 2006-08-24 02:46:33.000000000 +0530 +++ linux-2.6.19-rc1/drivers/scsi/mca_53c9x.c 2006-10-16 11:47:45.000000000 +0530 @@ -342,9 +342,8 @@ 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 | MCA_DMA_MODE_IO); @@ -352,7 +351,7 @@ 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) @@ -360,8 +359,7 @@ static void dma_init_write(struct NCR_ES 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 +368,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) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/