]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
scsi: mpt3sas: cleanup _scsih_pcie_enumeration_event()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 8 Nov 2017 08:38:01 +0000 (11:38 +0300)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 8 Nov 2017 23:16:38 +0000 (18:16 -0500)
The indenting wasn't right, because the last two prints weren't indented
far enough.  Also it used pr_info() where it was supposed to use
pr_cont().  I reversed the if statement and pulled the code in one tab
and did a couple other minor cleanups.

Fixes: 4318c7347847 ("scsi: mpt3sas: Handle NVMe PCIe device related events generated from firmware.")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Sathya Prakash Veerichetty <sathya.prakash@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/mpt3sas/mpt3sas_scsih.c

index 93c5fe0626861b0bbd738f51f04a7226d953861d..18d1804c674f05a2dc6188792f426cf29d354554 100644 (file)
@@ -7700,17 +7700,18 @@ _scsih_pcie_enumeration_event(struct MPT3SAS_ADAPTER *ioc,
        Mpi26EventDataPCIeEnumeration_t *event_data =
                (Mpi26EventDataPCIeEnumeration_t *)fw_event->event_data;
 
-       if (ioc->logging_level & MPT_DEBUG_EVENT_WORK_TASK) {
-               pr_info(MPT3SAS_FMT "pcie enumeration event: (%s) Flag 0x%02x",
-                       ioc->name,
-                       ((event_data->ReasonCode ==
-                       MPI26_EVENT_PCIE_ENUM_RC_STARTED) ?
-                       "started" : "completed"), event_data->Flags);
+       if (!(ioc->logging_level & MPT_DEBUG_EVENT_WORK_TASK))
+               return;
+
+       pr_info(MPT3SAS_FMT "pcie enumeration event: (%s) Flag 0x%02x",
+               ioc->name,
+               (event_data->ReasonCode == MPI26_EVENT_PCIE_ENUM_RC_STARTED) ?
+                       "started" : "completed",
+               event_data->Flags);
        if (event_data->EnumerationStatus)
-               pr_info("enumeration_status(0x%08x)",
-                   le32_to_cpu(event_data->EnumerationStatus));
-       pr_info("\n");
-       }
+               pr_cont("enumeration_status(0x%08x)",
+                       le32_to_cpu(event_data->EnumerationStatus));
+       pr_cont("\n");
 }
 
 /**