Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Nov 2025 12:21:13 +0000
From:      Christos Margiolis <christos@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 120f8a4c2ae8 - main - arm: Add missing argument in mtx_init() calls
Message-ID:  <69244db9.ec31.50ab677@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by christos:

URL: https://cgit.FreeBSD.org/src/commit/?id=120f8a4c2ae8a011827d83b098ecf70c791f794b

commit 120f8a4c2ae8a011827d83b098ecf70c791f794b
Author:     Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2025-11-24 12:19:25 +0000
Commit:     Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2025-11-24 12:19:25 +0000

    arm: Add missing argument in mtx_init() calls
    
    Fixes:          9d18115ca0ab ("sound: Retire snd_mtx* wrappers")
    Reported by:    CI
    Sponsored by:   The FreeBSD Foundation
    MFC after:      4 days
---
 sys/arm/freescale/imx/imx6_ssi.c  | 6 +-----
 sys/arm/freescale/vybrid/vf_sai.c | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/sys/arm/freescale/imx/imx6_ssi.c b/sys/arm/freescale/imx/imx6_ssi.c
index 76870cfb29c9..f4ef955761b4 100644
--- a/sys/arm/freescale/imx/imx6_ssi.c
+++ b/sys/arm/freescale/imx/imx6_ssi.c
@@ -736,11 +736,7 @@ ssi_attach(device_t dev)
 	sc->pos = 0;
 	sc->conf = malloc(sizeof(struct sdma_conf), M_DEVBUF, M_WAITOK | M_ZERO);
 
-	mtx_init(&sc->lock, device_get_nameunit(dev), "ssi softc");
-	if (sc->lock == NULL) {
-		device_printf(dev, "Can't create mtx\n");
-		return (ENXIO);
-	}
+	mtx_init(&sc->lock, device_get_nameunit(dev), "ssi softc", MTX_DEF);
 
 	if (bus_alloc_resources(dev, ssi_spec, sc->res)) {
 		device_printf(dev, "could not allocate resources\n");
diff --git a/sys/arm/freescale/vybrid/vf_sai.c b/sys/arm/freescale/vybrid/vf_sai.c
index 6ccfcae2bc2e..d3a3ab93fe80 100644
--- a/sys/arm/freescale/vybrid/vf_sai.c
+++ b/sys/arm/freescale/vybrid/vf_sai.c
@@ -691,11 +691,7 @@ sai_attach(device_t dev)
 	sc->sr = &rate_map[0];
 	sc->pos = 0;
 
-	mtx_init(&sc->lock, device_get_nameunit(dev), "sai softc");
-	if (sc->lock == NULL) {
-		device_printf(dev, "Cant create mtx\n");
-		return (ENXIO);
-	}
+	mtx_init(&sc->lock, device_get_nameunit(dev), "sai softc", MTX_DEF);
 
 	if (bus_alloc_resources(dev, sai_spec, sc->res)) {
 		device_printf(dev, "could not allocate resources\n");


help

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69244db9.ec31.50ab677>