From: FUJITA Tomonori Date: Thu, 9 Oct 2008 02:25:42 +0000 (+0900) Subject: [SCSI] 3w-xxxx: remove unnecessary local_irq_save/restore for scsi sg copy API X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0723d4a8064d52ae44ef2e19749a190b08846be3;p=openwrt%2Fstaging%2Fblogic.git [SCSI] 3w-xxxx: remove unnecessary local_irq_save/restore for scsi sg copy API Since the commit 50bed2e2862a8f3a4f7d683d0d27292e71ef18b9 (sg: disable interrupts inside sg_copy_buffer), no need to disable interrupts before calling scsi_sg_copy_from_buffer. So we can simplify tw_transfer_internal, which disables interrupts just for scsi_sg_copy_from_buffer. Signed-off-by: FUJITA Tomonori \ Acked-by: Adam Radford Signed-off-by: James Bottomley --- diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c index a0537f09aa21..c03f1d2c9e2e 100644 --- a/drivers/scsi/3w-xxxx.c +++ b/drivers/scsi/3w-xxxx.c @@ -1466,12 +1466,7 @@ static int tw_scsiop_inquiry(TW_Device_Extension *tw_dev, int request_id) static void tw_transfer_internal(TW_Device_Extension *tw_dev, int request_id, void *data, unsigned int len) { - struct scsi_cmnd *cmd = tw_dev->srb[request_id]; - unsigned long flags; - - local_irq_save(flags); - scsi_sg_copy_from_buffer(cmd, data, len); - local_irq_restore(flags); + scsi_sg_copy_from_buffer(tw_dev->srb[request_id], data, len); } /* This function is called by the isr to complete an inquiry command */