diff options
author | Wayne Boyer <wayneb@linux.vnet.ibm.com> | 2011-04-07 15:12:30 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2011-05-01 11:44:18 -0400 |
commit | 630ad8317feed51c55fa5c1c701e67430923aad8 (patch) | |
tree | a16f52590753958cf43ef8f6bd40b2e96d159aea /drivers/scsi/ipr.c | |
parent | 0bdccdb0a090ad8dc5f851cad5e843244c410ee8 (diff) |
[SCSI] ipr: remove unneeded volatile declarations
This patch removes three volatile declarations based on some feedback and code
analysis.
Signed-off-by: Wayne Boyer <wayneb@linux.vnet.ibm.com>
Acked-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/ipr.c')
-rw-r--r-- | drivers/scsi/ipr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 37790c073c28..a485e524ac8b 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
@@ -4953,7 +4953,7 @@ static int ipr_eh_abort(struct scsi_cmnd * scsi_cmd) | |||
4953 | * IRQ_NONE / IRQ_HANDLED | 4953 | * IRQ_NONE / IRQ_HANDLED |
4954 | **/ | 4954 | **/ |
4955 | static irqreturn_t ipr_handle_other_interrupt(struct ipr_ioa_cfg *ioa_cfg, | 4955 | static irqreturn_t ipr_handle_other_interrupt(struct ipr_ioa_cfg *ioa_cfg, |
4956 | volatile u32 int_reg) | 4956 | u32 int_reg) |
4957 | { | 4957 | { |
4958 | irqreturn_t rc = IRQ_HANDLED; | 4958 | irqreturn_t rc = IRQ_HANDLED; |
4959 | 4959 | ||
@@ -5016,7 +5016,7 @@ static irqreturn_t ipr_isr(int irq, void *devp) | |||
5016 | { | 5016 | { |
5017 | struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)devp; | 5017 | struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)devp; |
5018 | unsigned long lock_flags = 0; | 5018 | unsigned long lock_flags = 0; |
5019 | volatile u32 int_reg, int_mask_reg; | 5019 | u32 int_reg, int_mask_reg; |
5020 | u32 ioasc; | 5020 | u32 ioasc; |
5021 | u16 cmd_index; | 5021 | u16 cmd_index; |
5022 | int num_hrrq = 0; | 5022 | int num_hrrq = 0; |
@@ -7517,7 +7517,7 @@ static int ipr_reset_get_unit_check_job(struct ipr_cmnd *ipr_cmd) | |||
7517 | static int ipr_reset_restore_cfg_space(struct ipr_cmnd *ipr_cmd) | 7517 | static int ipr_reset_restore_cfg_space(struct ipr_cmnd *ipr_cmd) |
7518 | { | 7518 | { |
7519 | struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg; | 7519 | struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg; |
7520 | volatile u32 int_reg; | 7520 | u32 int_reg; |
7521 | 7521 | ||
7522 | ENTER; | 7522 | ENTER; |
7523 | ioa_cfg->pdev->state_saved = true; | 7523 | ioa_cfg->pdev->state_saved = true; |