From nobody Wed Mar 2 02:39:21 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 44C8119DEE07; Wed, 2 Mar 2022 02:39:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K7dc91QdBz4nh7; Wed, 2 Mar 2022 02:39:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646188761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1woUOoIQJj27UCytXR8eNHW5/BwXpufXi5oFLTLxpdY=; b=Xv79bcrN3bNRVkshBJ74Upli+ICWGUYOQsQRpVQFfGKZzrB40LDDBfTB6g2l4QcsocSVm3 dgazVzgjhqUA4VWYnzRNSJwNAn+UTPqoK4P6JKMa6N6D5eFnOYV90EO2SeWo6gfnFGwr8Q yJSUNY/iMEmXocR8NZIy79EzbBORvmNYMbX6MPLM9mdVjC+SP1hXazEcoDvlr0NaZosed5 Vdno1OtXszQrH0bmeoYXMMzG2Qf+Z+y1tuoemTCjBwrdtik5zY1C0jf9LCIh2fXrDwrOwu pZPJqpwYHrrFx5QQlcpHpUiXR4u7QB37VuB/g67dpfbTC892Mtj4EbTy3UXFHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 106471B1D8; Wed, 2 Mar 2022 02:39:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2222dLkk005887; Wed, 2 Mar 2022 02:39:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2222dLtD005886; Wed, 2 Mar 2022 02:39:21 GMT (envelope-from git) Date: Wed, 2 Mar 2022 02:39:21 GMT Message-Id: <202203020239.2222dLtD005886@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 137107f822b9 - stable/13 - mps/mpr: Add missing newlines in error messages. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 137107f822b946609e4edbc160241e2d811cfda7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646188761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1woUOoIQJj27UCytXR8eNHW5/BwXpufXi5oFLTLxpdY=; b=anxxtmT/9lGNfDOUiwYmGSUWd8EZDR2KwFrOiuZ3gBTGaqqzIuLyT1Em2vqnFsvJmgBb4R m4VGkjZlBh7hItCdIgqoep/GxsXnoL3cNQS4LIOk530XyXM/95fc26tgw04Et4vXmobHX1 nGraEpGIky19XX/H4Gkwg3sBNi//qGAdoZKXdETk9Pgb+mkUuvaRWNxSgcras82kwnsxHd PT6n4db+2b1/y70oy9Lc0MmV5cI3Y8iCtblhD5o4zm1rwfE0sgb4xqBpB3JVQX+Tb/VsCY qQ5g4zJxxxrgk+xngrA6Zijyuq9vG3GsH/tWwAlP3EL/9b+YnpQILwaQ1e7fQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646188761; a=rsa-sha256; cv=none; b=nnjQjeJ05M/4q48NZPG6tNKgxBfyNWPvrhoUigF/37PHysRvFNRw0+paK2SAmY1s4XQfwF cato3mAeLHsoWakuYpb01kVCHThRd1qB5FtIegha5UnkuzPi8KXfx+KCsS5OKcBoBgaED8 og4kuX0duoFyXHzp26GmyqUXMoTy4s0wBKrwuk8Vuawusee7n1uM23DpAJbZV6SXGz3Sst yyYuNRrlBvmmMwAZIUGhpiAgYhe5XuqLajCMbnrkyBjE7qhO6E+psXZYrtM5uiMXcMLbz0 u8pOhhjKdToZ4TsVIsnlwuAyJx06oAbK4SQdFpF3WvmbvRM2T02ppfIniYZHgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=137107f822b946609e4edbc160241e2d811cfda7 commit 137107f822b946609e4edbc160241e2d811cfda7 Author: Alexander Motin AuthorDate: 2022-02-22 20:06:48 +0000 Commit: Alexander Motin 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;