git: 4494ea5406f7 - main - mpi3mr: modified the log messages to be on a single line
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 28 Apr 2025 03:25:30 UTC
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4494ea5406f79a6cb2d3631a723eb286ca96a9b9 commit 4494ea5406f79a6cb2d3631a723eb286ca96a9b9 Author: Chandrakanth patil <chandrakanth.patil@broadcom.com> AuthorDate: 2025-04-27 23:41:19 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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; }