]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
scsi: smartpqi: minor tweaks to update time support
authorKevin Barnett <kevin.barnett@microsemi.com>
Wed, 31 Aug 2016 19:55:05 +0000 (14:55 -0500)
committerChuck Anderson <chuck.anderson@oracle.com>
Fri, 20 Jan 2017 05:35:01 +0000 (21:35 -0800)
Orabug: 25144431

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>
(cherry picked from commit 4fbebf1a779d9f6890ddc1df90c497b161dfb34c)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
drivers/scsi/smartpqi/smartpqi_init.c

index ac46ef499f9e7b04b88000480fff9f4f5ddff228..088a8cb448543a515ed15874493b4c1019de5681 100644 (file)
@@ -588,10 +588,6 @@ static void pqi_update_time_worker(struct work_struct *work)
        ctrl_info = container_of(to_delayed_work(work), struct pqi_ctrl_info,
                update_time_work);
 
-       if (!ctrl_info) {
-               printk("%s: NULL controller pointer.\n", __func__);
-               return;
-       }
        rc = pqi_write_current_time_to_host_wellness(ctrl_info);
        if (rc)
                dev_warn(&ctrl_info->pci_dev->dev,
@@ -602,9 +598,9 @@ static void pqi_update_time_worker(struct work_struct *work)
 }
 
 static inline void pqi_schedule_update_time_worker(
-                       struct pqi_ctrl_info *ctrl_info)
+       struct pqi_ctrl_info *ctrl_info)
 {
-       schedule_delayed_work(&ctrl_info->update_time_work, 120);
+       schedule_delayed_work(&ctrl_info->update_time_work, 0);
 }
 
 static int pqi_report_luns(struct pqi_ctrl_info *ctrl_info, u8 cmd,