* [PATCH 1/2] scsi: mpt3sas: cleanup _scsih_pcie_enumeration_event()
@ 2017-11-08 8:38 ` Dan Carpenter
0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2017-11-08 8:38 UTC (permalink / raw)
To: Sathya Prakash, Suganath Prabu Subramani
Cc: Chaitra P B, James E.J. Bottomley, Martin K. Petersen,
MPT-FusionLinux.pdl, linux-scsi, kernel-janitors
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>
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 3a9438a1704e..93b45e618edb 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -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");
}
/**
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 1/2] scsi: mpt3sas: cleanup _scsih_pcie_enumeration_event()
@ 2017-11-08 8:38 ` Dan Carpenter
0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2017-11-08 8:38 UTC (permalink / raw)
To: Sathya Prakash, Suganath Prabu Subramani
Cc: Chaitra P B, James E.J. Bottomley, Martin K. Petersen,
MPT-FusionLinux.pdl, linux-scsi, kernel-janitors
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>
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 3a9438a1704e..93b45e618edb 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -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");
}
/**
^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: [PATCH 1/2] scsi: mpt3sas: cleanup _scsih_pcie_enumeration_event()
2017-11-08 8:38 ` Dan Carpenter
@ 2017-11-08 16:02 ` Sathya Prakash Veerichetty
-1 siblings, 0 replies; 6+ messages in thread
From: Sathya Prakash Veerichetty @ 2017-11-08 16:02 UTC (permalink / raw)
To: Dan Carpenter, Suganath Prabu Subramani
Cc: Chaitra Basappa, James E.J. Bottomley, Martin K. Petersen,
PDL-MPT-FUSIONLINUX, linux-scsi, kernel-janitors
Thanks.
Acked-by: Sathya Prakash Veerichetty <sathya.prakash@broadcom.com>
-----Original Message-----
From: Dan Carpenter [mailto:dan.carpenter@oracle.com]
Sent: Wednesday, November 8, 2017 1:38 AM
To: Sathya Prakash; Suganath Prabu Subramani
Cc: Chaitra P B; James E.J. Bottomley; Martin K. Petersen;
MPT-FusionLinux.pdl@broadcom.com; linux-scsi@vger.kernel.org;
kernel-janitors@vger.kernel.org
Subject: [PATCH 1/2] scsi: mpt3sas: cleanup
_scsih_pcie_enumeration_event()
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>
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 3a9438a1704e..93b45e618edb 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -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");
}
/**
^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: [PATCH 1/2] scsi: mpt3sas: cleanup _scsih_pcie_enumeration_event()
@ 2017-11-08 16:02 ` Sathya Prakash Veerichetty
0 siblings, 0 replies; 6+ messages in thread
From: Sathya Prakash Veerichetty @ 2017-11-08 16:02 UTC (permalink / raw)
To: Dan Carpenter, Suganath Prabu Subramani
Cc: Chaitra Basappa, James E.J. Bottomley, Martin K. Petersen,
PDL-MPT-FUSIONLINUX, linux-scsi, kernel-janitors
Thanks.
Acked-by: Sathya Prakash Veerichetty <sathya.prakash@broadcom.com>
-----Original Message-----
From: Dan Carpenter [mailto:dan.carpenter@oracle.com]
Sent: Wednesday, November 8, 2017 1:38 AM
To: Sathya Prakash; Suganath Prabu Subramani
Cc: Chaitra P B; James E.J. Bottomley; Martin K. Petersen;
MPT-FusionLinux.pdl@broadcom.com; linux-scsi@vger.kernel.org;
kernel-janitors@vger.kernel.org
Subject: [PATCH 1/2] scsi: mpt3sas: cleanup
_scsih_pcie_enumeration_event()
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>
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 3a9438a1704e..93b45e618edb 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -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");
}
/**
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] scsi: mpt3sas: cleanup _scsih_pcie_enumeration_event()
2017-11-08 8:38 ` Dan Carpenter
@ 2017-11-08 23:17 ` Martin K. Petersen
-1 siblings, 0 replies; 6+ messages in thread
From: Martin K. Petersen @ 2017-11-08 23:17 UTC (permalink / raw)
To: Dan Carpenter
Cc: Sathya Prakash, Suganath Prabu Subramani, Chaitra P B,
James E.J. Bottomley, Martin K. Petersen, MPT-FusionLinux.pdl,
linux-scsi, kernel-janitors
Dan,
> 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.
Applied to 4.15/scsi-queue. Thank you!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] scsi: mpt3sas: cleanup _scsih_pcie_enumeration_event()
@ 2017-11-08 23:17 ` Martin K. Petersen
0 siblings, 0 replies; 6+ messages in thread
From: Martin K. Petersen @ 2017-11-08 23:17 UTC (permalink / raw)
To: Dan Carpenter
Cc: Sathya Prakash, Suganath Prabu Subramani, Chaitra P B,
James E.J. Bottomley, Martin K. Petersen, MPT-FusionLinux.pdl,
linux-scsi, kernel-janitors
Dan,
> 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.
Applied to 4.15/scsi-queue. Thank you!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-11-08 23:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-08 8:38 [PATCH 1/2] scsi: mpt3sas: cleanup _scsih_pcie_enumeration_event() Dan Carpenter
2017-11-08 8:38 ` Dan Carpenter
2017-11-08 16:02 ` Sathya Prakash Veerichetty
2017-11-08 16:02 ` Sathya Prakash Veerichetty
2017-11-08 23:17 ` Martin K. Petersen
2017-11-08 23:17 ` Martin K. Petersen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.