From nobody Wed Apr 30 17:22:00 2025 X-Original-To: dev-commits-src-branches@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 4ZnkWY03Vjz5tjKg; Wed, 30 Apr 2025 17:22:01 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZnkWX4j7Qz3MmL; Wed, 30 Apr 2025 17:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746033720; 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=E0NZeMcCsZovppH+Q1SZVwhzeYXbd7nL8HAXlHuVZpE=; b=FsY8AjNdhN6/vp/L68+v6u0StGQwjjh4G2y/1aA1NprAndc1eDS5DDiilWAtgFiYdaqnfg gAxMnIs6PURh0eRRaQpQUpUwoJZEr+RK4ls+EW1ZS3sIlrwuaxBM9vrvOH0+kPnvk9NUkB BW5P0hJevbMaPlHo6DEMNgacgdRy0QR8/R2XTFJ8me74h+1xOXpattj6z2J+0M4JaNhQ7w zSraEusRDvHqf7N1Nse+A50EsZW+Sq89ixoWn055RYgbSQAGG3tFS2T9dyokaGfjpLa/41 A/SnfHieHsuDthcnOeLX7H1ObpVbUXyT8H6xU8TUaYNQ1ilqzSV5TmC7mC3DfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746033720; a=rsa-sha256; cv=none; b=K2iuysNALtDS/R8jGZ0igm0w/ySFtHO7AudInFFME3MiRwENg90AJ6t2cwYNj0hEXQFRGB As7GYAXFKJYltiZEvv4DSNrZMx9++v8kGxniyeiYP4h0xdlfmsOYAUbQW61/zLEFgPL/ph eknEuUoxcEUdbz79YEYadLozB6slX4HVarjxrrIBP9AN+hOznpjNFRi4cOF8UMG+dZU4Si cD8CFaCrQiJQV14wPTUuZDTAYrhfxh6peFtPPkZdJp80UgtkT3BJXYq9oc3eTpdfpGYvNI IbOlxSNIIS7j7zgaJPp+SltHuNgqINh6qNjE1sng/efXF6PWNoHLZAALdlCLwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746033720; 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=E0NZeMcCsZovppH+Q1SZVwhzeYXbd7nL8HAXlHuVZpE=; b=lZBhHtZjO2OhnYjNRuRVCFkTmUVPBXiCi58m+eg+cT9aVIwOjoMxyzlCzSqtQQP5EhyNBQ SwyJqg4vgxlSrsJq+ScOe3/CaObg8a0YTO6yyA7tKNpsXpSmW6wQKu6+D59zBeDeWDiGWR Pmjb+U8pz18FPQWU/fU1GTyBUNoLyWtZD4i6OHAdloGEwFKnAFSoa0RMFiT8w9BDJByk+W sslAL9cPfOYteLMwYOS+kXiOTuSARMabc9kTAIASfsyL0+c6fq0EJMKDfiT8QHG/MsRPSq tmAFRe7/NgnLaKHjXqM9fbOQG1+wPcjZoC4vjz2fC2I3v93ZEceT/nhNuaZKYg== 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 4ZnkWX4K5jzkv; Wed, 30 Apr 2025 17:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53UHM0ed095599; Wed, 30 Apr 2025 17:22:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53UHM0Ej095596; Wed, 30 Apr 2025 17:22:00 GMT (envelope-from git) Date: Wed, 30 Apr 2025 17:22:00 GMT Message-Id: <202504301722.53UHM0Ej095596@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: b794f3126c82 - stable/14 - mpi3mr: modified the log messages to be on a single line List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b794f3126c823850f4a13ffa73ea4885013f4fd4 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b794f3126c823850f4a13ffa73ea4885013f4fd4 commit b794f3126c823850f4a13ffa73ea4885013f4fd4 Author: Chandrakanth patil AuthorDate: 2025-04-27 23:41:19 +0000 Commit: Warner Losh CommitDate: 2025-04-30 17:05:54 +0000 mpi3mr: modified the log messages to be on a single line qThis change was made after feedback from upstream, aiming to align with the style guide for consistent log formatting. No functional changes were made to the driver, only the formatting of the log messages. Reviewed by: ssaxena, imp Differential Revision: https://reviews.freebsd.org/D49799 (cherry picked from commit 4494ea5406f79a6cb2d3631a723eb286ca96a9b9) --- sys/dev/mpi3mr/mpi3mr.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c index a8bd83c3bef4..77266dddae10 100644 --- a/sys/dev/mpi3mr/mpi3mr.c +++ b/sys/dev/mpi3mr/mpi3mr.c @@ -2802,8 +2802,7 @@ retry_init: MPI3_SYSIF_FAULT_CODE_MASK; if (fault == MPI3_SYSIF_FAULT_CODE_INSUFFICIENT_PCI_SLOT_POWER) mpi3mr_dprint(sc, MPI3MR_INFO, - "controller faulted due to insufficient power. " - "try by connecting it in a different slot\n"); + "controller faulted due to insufficient power, try by connecting it in a different slot\n"); goto err; U32 host_diagnostic; @@ -3187,9 +3186,8 @@ static int mpi3mr_timestamp_sync(struct mpi3mr_softc *sc) if (((sc->init_cmds.ioc_status & MPI3_IOCSTATUS_STATUS_MASK) != MPI3_IOCSTATUS_SUCCESS) && (sc->init_cmds.ioc_status != MPI3_IOCSTATUS_SUPERVISOR_ONLY)) { - mpi3mr_dprint(sc, MPI3MR_ERROR, "Issue timestamp sync: Failed IOCStatus(0x%04x) " - " Loginfo(0x%08x) \n", (sc->init_cmds.ioc_status & MPI3_IOCSTATUS_STATUS_MASK), - sc->init_cmds.ioc_loginfo); + mpi3mr_dprint(sc, MPI3MR_ERROR, "Issue timestamp sync: Failed IOCStatus(0x%04x) Loginfo(0x%08x)\n", + (sc->init_cmds.ioc_status & MPI3_IOCSTATUS_STATUS_MASK), sc->init_cmds.ioc_loginfo); retval = -1; } @@ -3317,8 +3315,7 @@ mpi3mr_watchdog_thread(void *arg) if (fault == MPI3_SYSIF_FAULT_CODE_INSUFFICIENT_PCI_SLOT_POWER) { mpi3mr_dprint(sc, MPI3MR_INFO, - "controller faulted due to insufficient power, marking" - " controller as unrecoverable\n"); + "controller faulted due to insufficient power, marking controller as unrecoverable\n"); sc->unrecoverable = 1; break; }