]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
scsi: megaraid_sas: add print in device removal path
authorShivasharan S <shivasharan.srikanteshwara@broadcom.com>
Fri, 10 Feb 2017 08:59:16 +0000 (00:59 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 1 Jun 2017 21:06:03 +0000 (14:06 -0700)
Orabug: 26096381

Signed-off-by: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit b4a42213a7eb8ec8556f27e6750bbc5c9193e86e)
Signed-off-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>
Signed-off-by: Kirtikar Kashyap <kirtikar.kashyap@oracle.com>
Reviewed-by: Dhaval Giani <dhaval.giani@oracle.com>
drivers/scsi/megaraid/megaraid_sas_base.c

index 63488076d451a773f570da551da4bff0040aa8ed..bf1a42e8531b4eced7de61658f2dbf75dfb5e999 100644 (file)
@@ -7202,6 +7202,13 @@ megasas_sysfs_set_dbg_lvl(struct device_driver *dd, const char *buf, size_t coun
 static DRIVER_ATTR(dbg_lvl, S_IRUGO|S_IWUSR, megasas_sysfs_show_dbg_lvl,
                megasas_sysfs_set_dbg_lvl);
 
+static inline void megasas_remove_scsi_device(struct scsi_device *sdev)
+{
+       sdev_printk(KERN_INFO, sdev, "SCSI device is removed\n");
+       scsi_remove_device(sdev);
+       scsi_device_put(sdev);
+}
+
 static void
 megasas_aen_polling(struct work_struct *work)
 {
@@ -7306,10 +7313,8 @@ megasas_aen_polling(struct work_struct *work)
                                        else
                                                scsi_device_put(sdev1);
                                } else {
-                                       if (sdev1) {
-                                               scsi_remove_device(sdev1);
-                                               scsi_device_put(sdev1);
-                                       }
+                                       if (sdev1)
+                                               megasas_remove_scsi_device(sdev1);
                                }
                        }
                }
@@ -7326,10 +7331,8 @@ megasas_aen_polling(struct work_struct *work)
                                        else
                                                scsi_device_put(sdev1);
                                } else {
-                                       if (sdev1) {
-                                               scsi_remove_device(sdev1);
-                                               scsi_device_put(sdev1);
-                                       }
+                                       if (sdev1)
+                                               megasas_remove_scsi_device(sdev1);
                                }
                        }
                }