git: 70e0a1cbdce2 - stable/13 - mfi(4)/mrsas(4): Print driver versions consistently
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 03 May 2026 19:46:19 UTC
The branch stable/13 has been updated by michaelo:
URL: https://cgit.FreeBSD.org/src/commit/?id=70e0a1cbdce27bd8a6e8c5c3da40080f3f98a0f4
commit 70e0a1cbdce27bd8a6e8c5c3da40080f3f98a0f4
Author: Michael Osipov <michaelo@FreeBSD.org>
AuthorDate: 2025-12-21 17:13:21 +0000
Commit: Michael Osipov <michaelo@FreeBSD.org>
CommitDate: 2026-05-03 19:45:14 +0000
mfi(4)/mrsas(4): Print driver versions consistently
Reviewed by: ziaee, des
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D54519
(cherry picked from commit 93122ead724b3ba0ccdaedadcd371ec53f9a9844)
---
sys/dev/mfi/mfi.c | 2 +-
sys/dev/mrsas/mrsas.c | 9 +++------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c
index 4a7bee6e1bbc..a41d1f589835 100644
--- a/sys/dev/mfi/mfi.c
+++ b/sys/dev/mfi/mfi.c
@@ -372,7 +372,7 @@ mfi_attach(struct mfi_softc *sc)
if (sc == NULL)
return EINVAL;
- device_printf(sc->mfi_dev, "Megaraid SAS driver Ver %s \n",
+ device_printf(sc->mfi_dev, "LSI MegaRAID SAS driver version: %s\n",
MEGASAS_VERSION);
mtx_init(&sc->mfi_io_lock, "MFI I/O lock", NULL, MTX_DEF);
diff --git a/sys/dev/mrsas/mrsas.c b/sys/dev/mrsas/mrsas.c
index 9689dbec4417..dc13a24864c6 100644
--- a/sys/dev/mrsas/mrsas.c
+++ b/sys/dev/mrsas/mrsas.c
@@ -381,15 +381,9 @@ mrsas_find_ident(device_t dev)
static int
mrsas_probe(device_t dev)
{
- static u_int8_t first_ctrl = 1;
struct mrsas_ident *id;
if ((id = mrsas_find_ident(dev)) != NULL) {
- if (first_ctrl) {
- printf("AVAGO MegaRAID SAS FreeBSD mrsas driver version: %s\n",
- MRSAS_VERSION);
- first_ctrl = 0;
- }
device_set_desc(dev, id->desc);
/* between BUS_PROBE_DEFAULT and BUS_PROBE_LOW_PRIORITY */
return (-30);
@@ -862,6 +856,9 @@ mrsas_attach(device_t dev)
struct mrsas_softc *sc = device_get_softc(dev);
uint32_t cmd, error;
+ device_printf(dev, "AVAGO MegaRAID SAS driver version: %s\n",
+ MRSAS_VERSION);
+
memset(sc, 0, sizeof(struct mrsas_softc));
/* Look up our softc and initialize its fields. */