From nobody Mon Apr 28 03:25:30 2025 X-Original-To: dev-commits-src-main@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 4Zm83G6d3Pz5tl6b; Mon, 28 Apr 2025 03:25:30 +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 4Zm83G1gzCz3ct2; Mon, 28 Apr 2025 03:25:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745810730; 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=0+sIatB5oTRstvH4xiOGAvZKdbG15WKWPfXSXTxIUHQ=; b=rXxgTPWttazSbAUasxTpq8vgDXGHZNhLY7Giy4WVAM94zZqjz0KhmsJuCLMUmiLXmEE8s7 FEJHELQXFZmiFg9WdkvkXUDjimardB3lg7YqZTXxktXITydtbMVvUI6N4bMl2rQin/b/AG o5QJSlXKZyGMd9NchDZUZJhsYsyvTo3FkVpFcwrYAzme6dw52Vi4ii3Uk8jroi+yEEyYTh A6XOvU4qDDJm/7Tqr6u3lVQiTeGQhikzFFd9uN3TiPi+Mm1gQZ91qHanFRJia7o77xAqu/ gS1eYiy2qXKdtsWf4tsaT4DjqiaZMwRYv2RiIWfQMZdqJt1QsO1qzCw0fCBpaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745810730; a=rsa-sha256; cv=none; b=ZVRFPfVVNYQHez1uxf4HUnGqxzghW9f7kXLtEInUSYskRmCDlyAUanfhafvXguvPUXIFyL sJ1mQDST/vL/N6wjaUMdxVKg8kRQCMS2NsXA+MKi4+DBtGuk4AslGYLz4STKWbagrybNxi J1CmcDIZ6q3zZrkYRt+p4ytA+xi4Z4ZNNzxqPAhnkC6pTL1AwFmjoE5vg+GMwQfpxieOS/ /piIPSGNLz8RJLEhopSv0/IbRNyjFlyEH3zHc1y8wERKQW9rDJf2gVegH3xarP42LJm/T1 hU1aEZ9AmQOtWHUmdTOi44Gh04frTG9Wwn6OmYk3L0AI0Lr+kgGpde0OCFg4wQ== 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=1745810730; 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=0+sIatB5oTRstvH4xiOGAvZKdbG15WKWPfXSXTxIUHQ=; b=CdunPjDypWAWs2hdcmY0v7FE5oR7VtmgkzpyYUo5+6G7jBmNq8eHlfhBad8RJSI2N9UHEM gzDwoBUyFM5WmpRbLFyOGMlHCy8GkMKoRsYDMbf9NSljwODLA9BJof8VoISVaPESggsBtz IWjLhklftQek3FUrxg+8DF1KAp7jJDpA8UDOQZe7zUcQZ6rPm70PRm/Lc6JMJMExEFwwnC XN4setdkUYhv9llzMcvdRR7nJrexWjesS4xNq/ygWjn/dYpU+HRpHilZmACYIev8T+N/e7 WfHav64rBgOzGKXefYErh9mle0b1DjP1pm6FiP+O0zN3cxw/OUb3yuYRtyOzaA== 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 4Zm83G1F0Zz3Hm; Mon, 28 Apr 2025 03:25:30 +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 53S3PUEx015025; Mon, 28 Apr 2025 03:25:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53S3PUcF015022; Mon, 28 Apr 2025 03:25:30 GMT (envelope-from git) Date: Mon, 28 Apr 2025 03:25:30 GMT Message-Id: <202504280325.53S3PUcF015022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4494ea5406f7 - main - mpi3mr: modified the log messages to be on a single line List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 4494ea5406f79a6cb2d3631a723eb286ca96a9b9 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4494ea5406f79a6cb2d3631a723eb286ca96a9b9 commit 4494ea5406f79a6cb2d3631a723eb286ca96a9b9 Author: Chandrakanth patil AuthorDate: 2025-04-27 23:41:19 +0000 Commit: Warner Losh CommitDate: 2025-04-28 03:24:52 +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 --- 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 4acf0c84023f..99edd3542619 100644 --- a/sys/dev/mpi3mr/mpi3mr.c +++ b/sys/dev/mpi3mr/mpi3mr.c @@ -2801,8 +2801,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; @@ -3186,9 +3185,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; } @@ -3316,8 +3314,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; }