Date: Sun, 03 May 2026 19:38:18 +0000 From: Michael Osipov <michaelo@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: e0bf70d5ec12 - stable/14 - mfi(4)/mrsas(4): Print driver versions consistently Message-ID: <69f7a42a.3eae3.1a7f6396@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=e0bf70d5ec12c266e6eaece18bb97994137c2b2a commit e0bf70d5ec12c266e6eaece18bb97994137c2b2a 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:37: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 40a1ba64e509..a26739e36db5 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -371,7 +371,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 e362d4b455fc..379fcbcb19ca 100644 --- a/sys/dev/mrsas/mrsas.c +++ b/sys/dev/mrsas/mrsas.c @@ -349,15 +349,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); @@ -830,6 +824,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. */home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f7a42a.3eae3.1a7f6396>