Message ID | 1564151143-22889-1-git-send-email-cai@lca.pw (mailing list archive) |
---|---|
State | Mainlined |
Commit | e5460f084b84f06756e558fbfd2313202fb1dbd0 |
Headers | show |
Series | scsi/megaraid_sas: fix a compilation warning | expand |
Ping. Please take a look at this trivial patch. > On Jul 26, 2019, at 10:25 AM, Qian Cai <cai@lca.pw> wrote: > > The commit de516379e85f ("scsi: megaraid_sas: changes to function > prototypes") introduced a comilation warning due to it changed the > function prototype of read_fw_status_reg() to take an instance pointer > instead, but forgot to remove an unused variable. > > drivers/scsi/megaraid/megaraid_sas_fusion.c: In function > 'megasas_fusion_update_can_queue': > drivers/scsi/megaraid/megaraid_sas_fusion.c:326:39: warning: variable > 'reg_set' set but not used [-Wunused-but-set-variable] > struct megasas_register_set __iomem *reg_set; > ^~~~~~~ > Fixes: de516379e85f ("scsi: megaraid_sas: changes to function prototypes") > Signed-off-by: Qian Cai <cai@lca.pw> > --- > drivers/scsi/megaraid/megaraid_sas_fusion.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c > index a32b3f0fcd15..e8092d59d575 100644 > --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c > +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c > @@ -323,9 +323,6 @@ inline void megasas_return_cmd_fusion(struct megasas_instance *instance, > { > u16 cur_max_fw_cmds = 0; > u16 ldio_threshold = 0; > - struct megasas_register_set __iomem *reg_set; > - > - reg_set = instance->reg_set; > > /* ventura FW does not fill outbound_scratch_pad_2 with queue depth */ > if (instance->adapter_type < VENTURA_SERIES) > -- > 1.8.3.1 >
On Fri, Jul 26, 2019 at 7:55 PM Qian Cai <cai@lca.pw> wrote: > > The commit de516379e85f ("scsi: megaraid_sas: changes to function > prototypes") introduced a comilation warning due to it changed the > function prototype of read_fw_status_reg() to take an instance pointer > instead, but forgot to remove an unused variable. > > drivers/scsi/megaraid/megaraid_sas_fusion.c: In function > 'megasas_fusion_update_can_queue': > drivers/scsi/megaraid/megaraid_sas_fusion.c:326:39: warning: variable > 'reg_set' set but not used [-Wunused-but-set-variable] > struct megasas_register_set __iomem *reg_set; > ^~~~~~~ > Fixes: de516379e85f ("scsi: megaraid_sas: changes to function prototypes") > Signed-off-by: Qian Cai <cai@lca.pw> Acked-by: Sumit Saxena <sumit.saxena@broadcom.com> > --- > drivers/scsi/megaraid/megaraid_sas_fusion.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c > index a32b3f0fcd15..e8092d59d575 100644 > --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c > +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c > @@ -323,9 +323,6 @@ inline void megasas_return_cmd_fusion(struct megasas_instance *instance, > { > u16 cur_max_fw_cmds = 0; > u16 ldio_threshold = 0; > - struct megasas_register_set __iomem *reg_set; > - > - reg_set = instance->reg_set; > > /* ventura FW does not fill outbound_scratch_pad_2 with queue depth */ > if (instance->adapter_type < VENTURA_SERIES) > -- > 1.8.3.1 >
Qian, > The commit de516379e85f ("scsi: megaraid_sas: changes to function > prototypes") introduced a comilation warning due to it changed the > function prototype of read_fw_status_reg() to take an instance pointer > instead, but forgot to remove an unused variable. Applied to 5.4/scsi-queue, thanks!
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c index a32b3f0fcd15..e8092d59d575 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -323,9 +323,6 @@ inline void megasas_return_cmd_fusion(struct megasas_instance *instance, { u16 cur_max_fw_cmds = 0; u16 ldio_threshold = 0; - struct megasas_register_set __iomem *reg_set; - - reg_set = instance->reg_set; /* ventura FW does not fill outbound_scratch_pad_2 with queue depth */ if (instance->adapter_type < VENTURA_SERIES)
The commit de516379e85f ("scsi: megaraid_sas: changes to function prototypes") introduced a comilation warning due to it changed the function prototype of read_fw_status_reg() to take an instance pointer instead, but forgot to remove an unused variable. drivers/scsi/megaraid/megaraid_sas_fusion.c: In function 'megasas_fusion_update_can_queue': drivers/scsi/megaraid/megaraid_sas_fusion.c:326:39: warning: variable 'reg_set' set but not used [-Wunused-but-set-variable] struct megasas_register_set __iomem *reg_set; ^~~~~~~ Fixes: de516379e85f ("scsi: megaraid_sas: changes to function prototypes") Signed-off-by: Qian Cai <cai@lca.pw> --- drivers/scsi/megaraid/megaraid_sas_fusion.c | 3 --- 1 file changed, 3 deletions(-)