git: 137107f822b9 - stable/13 - mps/mpr: Add missing newlines in error messages.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 02 Mar 2022 02:39:21 UTC
The branch stable/13 has been updated by mav:
URL: https://cgit.FreeBSD.org/src/commit/?id=137107f822b946609e4edbc160241e2d811cfda7
commit 137107f822b946609e4edbc160241e2d811cfda7
Author: Alexander Motin <mav@FreeBSD.org>
AuthorDate: 2022-02-22 20:06:48 +0000
Commit: Alexander Motin <mav@FreeBSD.org>
CommitDate: 2022-03-02 02:39:10 +0000
mps/mpr: Add missing newlines in error messages.
MFC after: 1 week
(cherry picked from commit 074bed4f486b4fa54e4d9bd2fccfad3cce732ba1)
---
sys/dev/mpr/mpr_config.c | 48 +++++++++++++++++++++++------------------------
sys/dev/mpr/mpr_sas_lsi.c | 2 +-
sys/dev/mps/mps_config.c | 36 +++++++++++++++++------------------
3 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/sys/dev/mpr/mpr_config.c b/sys/dev/mpr/mpr_config.c
index 2b5bc7e3964b..133be81093eb 100644
--- a/sys/dev/mpr/mpr_config.c
+++ b/sys/dev/mpr/mpr_config.c
@@ -105,7 +105,7 @@ mpr_config_get_ioc_pg8(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for header completed with error %d",
+ printf("%s: request for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -164,7 +164,7 @@ mpr_config_get_ioc_pg8(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for page completed with error %d",
+ printf("%s: request for page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -237,7 +237,7 @@ mpr_config_get_iounit_pg8(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for header completed with error %d",
+ printf("%s: request for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -296,7 +296,7 @@ mpr_config_get_iounit_pg8(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for page completed with error %d",
+ printf("%s: request for page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -369,7 +369,7 @@ mpr_config_get_man_pg11(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for header completed with error %d",
+ printf("%s: request for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -427,7 +427,7 @@ mpr_config_get_man_pg11(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for page completed with error %d",
+ printf("%s: request for page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -562,7 +562,7 @@ mpr_config_get_dpm_pg0(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for header completed with error %d",
+ printf("%s: request for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -623,7 +623,7 @@ mpr_config_get_dpm_pg0(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for page completed with error %d",
+ printf("%s: request for page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -700,7 +700,7 @@ int mpr_config_set_dpm_pg0(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for header completed with error %d",
+ printf("%s: request for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -763,7 +763,7 @@ int mpr_config_set_dpm_pg0(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request to write page completed with error %d",
+ printf("%s: request to write page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -837,7 +837,7 @@ mpr_config_get_sas_device_pg0(struct mpr_softc *sc, Mpi2ConfigReply_t
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for header completed with error %d",
+ printf("%s: request for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -898,7 +898,7 @@ mpr_config_get_sas_device_pg0(struct mpr_softc *sc, Mpi2ConfigReply_t
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for page completed with error %d",
+ printf("%s: request for page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -974,7 +974,7 @@ mpr_config_get_pcie_device_pg0(struct mpr_softc *sc, Mpi2ConfigReply_t
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for header completed with error %d",
+ printf("%s: request for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -1035,7 +1035,7 @@ mpr_config_get_pcie_device_pg0(struct mpr_softc *sc, Mpi2ConfigReply_t
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for page completed with error %d",
+ printf("%s: request for page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -1111,7 +1111,7 @@ mpr_config_get_pcie_device_pg2(struct mpr_softc *sc, Mpi2ConfigReply_t
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for header completed with error %d",
+ printf("%s: request for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -1172,7 +1172,7 @@ mpr_config_get_pcie_device_pg2(struct mpr_softc *sc, Mpi2ConfigReply_t
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for page completed with error %d",
+ printf("%s: request for page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -1245,7 +1245,7 @@ mpr_config_get_bios_pg3(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for header completed with error %d",
+ printf("%s: request for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -1304,7 +1304,7 @@ mpr_config_get_bios_pg3(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for page completed with error %d",
+ printf("%s: request for page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -1379,7 +1379,7 @@ mpr_config_get_raid_volume_pg0(struct mpr_softc *sc, Mpi2ConfigReply_t
if (error || (reply == NULL)) {
/* FIXME */
/* If the poll returns error then we need to do diag reset */
- printf("%s: poll for header completed with error %d",
+ printf("%s: poll for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -1437,7 +1437,7 @@ mpr_config_get_raid_volume_pg0(struct mpr_softc *sc, Mpi2ConfigReply_t
if (error || (reply == NULL)) {
/* FIXME */
/* If the poll returns error then we need to do diag reset */
- printf("%s: poll for page completed with error %d",
+ printf("%s: poll for page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -1508,7 +1508,7 @@ mpr_config_get_raid_volume_pg1(struct mpr_softc *sc, Mpi2ConfigReply_t
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for header completed with error %d",
+ printf("%s: request for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -1568,7 +1568,7 @@ mpr_config_get_raid_volume_pg1(struct mpr_softc *sc, Mpi2ConfigReply_t
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for page completed with error %d",
+ printf("%s: request for page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -1669,7 +1669,7 @@ mpr_config_get_raid_pd_pg0(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply,
if (error || (reply == NULL)) {
/* FIXME */
/* If the poll returns error then we need to do diag reset */
- printf("%s: poll for header completed with error %d",
+ printf("%s: poll for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -1727,7 +1727,7 @@ mpr_config_get_raid_pd_pg0(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply,
if (error || (reply == NULL)) {
/* FIXME */
/* If the poll returns error then we need to do diag reset */
- printf("%s: poll for page completed with error %d",
+ printf("%s: poll for page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
diff --git a/sys/dev/mpr/mpr_sas_lsi.c b/sys/dev/mpr/mpr_sas_lsi.c
index 92b78c5e0d17..d84b527cd7c7 100644
--- a/sys/dev/mpr/mpr_sas_lsi.c
+++ b/sys/dev/mpr/mpr_sas_lsi.c
@@ -356,7 +356,7 @@ mprsas_fw_work(struct mpr_softc *sc, struct mpr_fw_event_work *fw_event)
* need to do diag reset
*/
printf("%s: poll for page completed "
- "with error %d", __func__, error);
+ "with error %d\n", __func__, error);
}
if (reply && (le16toh(reply->IOCStatus) &
MPI2_IOCSTATUS_MASK) !=
diff --git a/sys/dev/mps/mps_config.c b/sys/dev/mps/mps_config.c
index 4c67487dbe8f..d25347cb8f1a 100644
--- a/sys/dev/mps/mps_config.c
+++ b/sys/dev/mps/mps_config.c
@@ -105,7 +105,7 @@ mps_config_get_ioc_pg8(struct mps_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for header completed with error %d",
+ printf("%s: request for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -164,7 +164,7 @@ mps_config_get_ioc_pg8(struct mps_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for page completed with error %d",
+ printf("%s: request for page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -240,7 +240,7 @@ mps_config_get_man_pg10(struct mps_softc *sc, Mpi2ConfigReply_t *mpi_reply)
if (error || (reply == NULL)) {
/* FIXME */
/* If the poll returns error then we need to do diag reset */
- printf("%s: poll for header completed with error %d",
+ printf("%s: poll for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -297,7 +297,7 @@ mps_config_get_man_pg10(struct mps_softc *sc, Mpi2ConfigReply_t *mpi_reply)
if (error || (reply == NULL)) {
/* FIXME */
/* If the poll returns error then we need to do diag reset */
- printf("%s: poll for page completed with error %d",
+ printf("%s: poll for page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -601,7 +601,7 @@ mps_config_get_dpm_pg0(struct mps_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for header completed with error %d",
+ printf("%s: request for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -662,7 +662,7 @@ mps_config_get_dpm_pg0(struct mps_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for page completed with error %d",
+ printf("%s: request for page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -739,7 +739,7 @@ int mps_config_set_dpm_pg0(struct mps_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for header completed with error %d",
+ printf("%s: request for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -802,7 +802,7 @@ int mps_config_set_dpm_pg0(struct mps_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request to write page completed with error %d",
+ printf("%s: request to write page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -876,7 +876,7 @@ mps_config_get_sas_device_pg0(struct mps_softc *sc, Mpi2ConfigReply_t
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for header completed with error %d",
+ printf("%s: request for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -937,7 +937,7 @@ mps_config_get_sas_device_pg0(struct mps_softc *sc, Mpi2ConfigReply_t
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for page completed with error %d",
+ printf("%s: request for page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -1010,7 +1010,7 @@ mps_config_get_bios_pg3(struct mps_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for header completed with error %d",
+ printf("%s: request for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -1069,7 +1069,7 @@ mps_config_get_bios_pg3(struct mps_softc *sc, Mpi2ConfigReply_t *mpi_reply,
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for page completed with error %d",
+ printf("%s: request for page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -1144,7 +1144,7 @@ mps_config_get_raid_volume_pg0(struct mps_softc *sc, Mpi2ConfigReply_t
if (error || (reply == NULL)) {
/* FIXME */
/* If the poll returns error then we need to do diag reset */
- printf("%s: poll for header completed with error %d",
+ printf("%s: poll for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -1202,7 +1202,7 @@ mps_config_get_raid_volume_pg0(struct mps_softc *sc, Mpi2ConfigReply_t
if (error || (reply == NULL)) {
/* FIXME */
/* If the poll returns error then we need to do diag reset */
- printf("%s: poll for page completed with error %d",
+ printf("%s: poll for page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -1273,7 +1273,7 @@ mps_config_get_raid_volume_pg1(struct mps_softc *sc, Mpi2ConfigReply_t
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for header completed with error %d",
+ printf("%s: request for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -1333,7 +1333,7 @@ mps_config_get_raid_volume_pg1(struct mps_softc *sc, Mpi2ConfigReply_t
* If the request returns an error then we need to do a diag
* reset
*/
- printf("%s: request for page completed with error %d",
+ printf("%s: request for page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -1434,7 +1434,7 @@ mps_config_get_raid_pd_pg0(struct mps_softc *sc, Mpi2ConfigReply_t *mpi_reply,
if (error || (reply == NULL)) {
/* FIXME */
/* If the poll returns error then we need to do diag reset */
- printf("%s: poll for header completed with error %d",
+ printf("%s: poll for header completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;
@@ -1492,7 +1492,7 @@ mps_config_get_raid_pd_pg0(struct mps_softc *sc, Mpi2ConfigReply_t *mpi_reply,
if (error || (reply == NULL)) {
/* FIXME */
/* If the poll returns error then we need to do diag reset */
- printf("%s: poll for page completed with error %d",
+ printf("%s: poll for page completed with error %d\n",
__func__, error);
error = ENXIO;
goto out;