| Message ID | 20190525124202.8120-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | de19212c2890d1bb1e2d0e303affba620b86819b |
| Headers | show |
| Series | [-next] scsi: megaraid_sas: remove set but not used variables 'host' and 'wait_time' | expand |
On Sat, May 25, 2019 at 6:14 PM YueHaibing <yuehaibing@huawei.com> wrote: > > Fixes gcc '-Wunused-but-set-variable' warnings: > > drivers/scsi/megaraid/megaraid_sas_base.c: In function megasas_suspend: > drivers/scsi/megaraid/megaraid_sas_base.c:7269:20: warning: variable host set but not used [-Wunused-but-set-variable] > drivers/scsi/megaraid/megaraid_sas_base.c: In function megasas_aen_polling: > drivers/scsi/megaraid/megaraid_sas_base.c:8397:15: warning: variable wait_time set but not used [-Wunused-but-set-variable] > > 'host' is never used since introduction in > commit 31ea7088974c ("[SCSI] megaraid_sas: add hibernation support") > > 'wait_time' is not used since commit > 11c71cb4ab7c ("megaraid_sas: Do not allow PCI access during OCR") > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Acked-by: Sumit Saxena <sumit.saxena@broadcom.com> > --- > drivers/scsi/megaraid/megaraid_sas_base.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c > index 92e576228d5f..ed0f6ca578e5 100644 > --- a/drivers/scsi/megaraid/megaraid_sas_base.c > +++ b/drivers/scsi/megaraid/megaraid_sas_base.c > @@ -7239,11 +7239,9 @@ static void megasas_shutdown_controller(struct megasas_instance *instance, > static int > megasas_suspend(struct pci_dev *pdev, pm_message_t state) > { > - struct Scsi_Host *host; > struct megasas_instance *instance; > > instance = pci_get_drvdata(pdev); > - host = instance->host; > instance->unload = 1; > > dev_info(&pdev->dev, "%s is called\n", __func__); > @@ -8367,7 +8365,7 @@ megasas_aen_polling(struct work_struct *work) > struct megasas_instance *instance = ev->instance; > union megasas_evt_class_locale class_locale; > int event_type = 0; > - u32 seq_num, wait_time = MEGASAS_RESET_WAIT_TIME; > + u32 seq_num; > int error; > u8 dcmd_ret = DCMD_SUCCESS; > > @@ -8377,10 +8375,6 @@ megasas_aen_polling(struct work_struct *work) > return; > } > > - /* Adjust event workqueue thread wait time for VF mode */ > - if (instance->requestorId) > - wait_time = MEGASAS_ROUTINE_WAIT_TIME_VF; > - > /* Don't run the event workqueue thread if OCR is running */ > mutex_lock(&instance->reset_mutex); > > -- > 2.17.1 > >
YueHaibing, > Fixes gcc '-Wunused-but-set-variable' warnings: > > drivers/scsi/megaraid/megaraid_sas_base.c: In function megasas_suspend: > drivers/scsi/megaraid/megaraid_sas_base.c:7269:20: warning: variable host set but not used [-Wunused-but-set-variable] > drivers/scsi/megaraid/megaraid_sas_base.c: In function megasas_aen_polling: > drivers/scsi/megaraid/megaraid_sas_base.c:8397:15: warning: variable wait_time set but not used [-Wunused-but-set-variable] > > 'host' is never used since introduction in > commit 31ea7088974c ("[SCSI] megaraid_sas: add hibernation support") > > 'wait_time' is not used since commit > 11c71cb4ab7c ("megaraid_sas: Do not allow PCI access during OCR") Applied to 5.3/scsi-queue, thanks.
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 92e576228d5f..ed0f6ca578e5 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -7239,11 +7239,9 @@ static void megasas_shutdown_controller(struct megasas_instance *instance, static int megasas_suspend(struct pci_dev *pdev, pm_message_t state) { - struct Scsi_Host *host; struct megasas_instance *instance; instance = pci_get_drvdata(pdev); - host = instance->host; instance->unload = 1; dev_info(&pdev->dev, "%s is called\n", __func__); @@ -8367,7 +8365,7 @@ megasas_aen_polling(struct work_struct *work) struct megasas_instance *instance = ev->instance; union megasas_evt_class_locale class_locale; int event_type = 0; - u32 seq_num, wait_time = MEGASAS_RESET_WAIT_TIME; + u32 seq_num; int error; u8 dcmd_ret = DCMD_SUCCESS; @@ -8377,10 +8375,6 @@ megasas_aen_polling(struct work_struct *work) return; } - /* Adjust event workqueue thread wait time for VF mode */ - if (instance->requestorId) - wait_time = MEGASAS_ROUTINE_WAIT_TIME_VF; - /* Don't run the event workqueue thread if OCR is running */ mutex_lock(&instance->reset_mutex);
Fixes gcc '-Wunused-but-set-variable' warnings: drivers/scsi/megaraid/megaraid_sas_base.c: In function megasas_suspend: drivers/scsi/megaraid/megaraid_sas_base.c:7269:20: warning: variable host set but not used [-Wunused-but-set-variable] drivers/scsi/megaraid/megaraid_sas_base.c: In function megasas_aen_polling: drivers/scsi/megaraid/megaraid_sas_base.c:8397:15: warning: variable wait_time set but not used [-Wunused-but-set-variable] 'host' is never used since introduction in commit 31ea7088974c ("[SCSI] megaraid_sas: add hibernation support") 'wait_time' is not used since commit 11c71cb4ab7c ("megaraid_sas: Do not allow PCI access during OCR") Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- drivers/scsi/megaraid/megaraid_sas_base.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)