diff options
author | Kevin Barnett <kevin.barnett@microsemi.com> | 2016-08-31 15:55:05 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2016-09-02 06:21:38 -0400 |
commit | 4fbebf1a779d9f6890ddc1df90c497b161dfb34c (patch) | |
tree | 2c1944ac9cea39adbcdf47f8ab36b7383320288e | |
parent | df7a1fcfc4761e658b60739e2ff4cd148afcae89 (diff) |
scsi: smartpqi: minor tweaks to update time support
minor tweaks to update time support
Reviewed-by: Scott Teel <scott.teel@microsemi.com>
Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Kevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r-- | drivers/scsi/smartpqi/smartpqi_init.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index bfd2d75463c5..db248c15adaf 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c | |||
@@ -588,10 +588,6 @@ static void pqi_update_time_worker(struct work_struct *work) | |||
588 | ctrl_info = container_of(to_delayed_work(work), struct pqi_ctrl_info, | 588 | ctrl_info = container_of(to_delayed_work(work), struct pqi_ctrl_info, |
589 | update_time_work); | 589 | update_time_work); |
590 | 590 | ||
591 | if (!ctrl_info) { | ||
592 | printk("%s: NULL controller pointer.\n", __func__); | ||
593 | return; | ||
594 | } | ||
595 | rc = pqi_write_current_time_to_host_wellness(ctrl_info); | 591 | rc = pqi_write_current_time_to_host_wellness(ctrl_info); |
596 | if (rc) | 592 | if (rc) |
597 | dev_warn(&ctrl_info->pci_dev->dev, | 593 | dev_warn(&ctrl_info->pci_dev->dev, |
@@ -602,9 +598,9 @@ static void pqi_update_time_worker(struct work_struct *work) | |||
602 | } | 598 | } |
603 | 599 | ||
604 | static inline void pqi_schedule_update_time_worker( | 600 | static inline void pqi_schedule_update_time_worker( |
605 | struct pqi_ctrl_info *ctrl_info) | 601 | struct pqi_ctrl_info *ctrl_info) |
606 | { | 602 | { |
607 | schedule_delayed_work(&ctrl_info->update_time_work, 120); | 603 | schedule_delayed_work(&ctrl_info->update_time_work, 0); |
608 | } | 604 | } |
609 | 605 | ||
610 | static int pqi_report_luns(struct pqi_ctrl_info *ctrl_info, u8 cmd, | 606 | static int pqi_report_luns(struct pqi_ctrl_info *ctrl_info, u8 cmd, |