scsi: smartpqi: cleanup list initialization

Orabug: 26191021, 26447813

Better initialization of linked list heads.

Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
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 8a994a04fc3a8edbcc0ba1d17219b6d8f4c38009)
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index 80248293f92ddef3fc682aa974a9043a9052d7ce..6c6bd9caefab91505b232644b5bf6c0b79dae079 100644 (file)
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -1603,11 +1603,8 @@ static void pqi_update_device_list(struct pqi_ctrl_info *ctrl_info,
        struct pqi_scsi_dev *device;
        struct pqi_scsi_dev *next;
        struct pqi_scsi_dev *matching_device;
-       struct list_head add_list;
-       struct list_head delete_list;
-
-       INIT_LIST_HEAD(&add_list);
-       INIT_LIST_HEAD(&delete_list);
+       LIST_HEAD(add_list);
+       LIST_HEAD(delete_list);
 
        /*
         * The idea here is to do as little work as possible while holding the
@@ -1767,7 +1764,7 @@ static int pqi_update_scsi_devices(struct pqi_ctrl_info *ctrl_info)
 {
        int i;
        int rc;
-       struct list_head new_device_list_head;
+       LIST_HEAD(new_device_list_head);
        struct report_phys_lun_extended *physdev_list = NULL;
        struct report_log_lun_extended *logdev_list = NULL;
        struct report_phys_lun_extended_entry *phys_lun_ext_entry;
@@ -1785,8 +1782,6 @@ static int pqi_update_scsi_devices(struct pqi_ctrl_info *ctrl_info)
        static char *out_of_memory_msg =
                "failed to allocate memory, device discovery stopped";
 
-       INIT_LIST_HEAD(&new_device_list_head);
-
        rc = pqi_get_device_lists(ctrl_info, &physdev_list, &logdev_list);
        if (rc)
                goto out;