Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Apr 2026 17:55:53 +0000
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 06fcab1f02fe - stable/15 - sdhci_fdt_rockchip: Don't return 0 from probe routine
Message-ID:  <69ebaea9.1cbcd.52203e15@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch stable/15 has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=06fcab1f02feb2614751f875b18af9f1ffc2cbfb

commit 06fcab1f02feb2614751f875b18af9f1ffc2cbfb
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2026-02-09 16:27:23 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2026-04-24 15:33:21 +0000

    sdhci_fdt_rockchip: Don't return 0 from probe routine
    
    The only write to the softc is a no-op (softcs are initialized to all
    zeroes), so remove that and just use BUS_PROBE_DEFAULT.
    
    Reviewed by:    bnovkov
    Differential Revision:  https://reviews.freebsd.org/D55159
    
    (cherry picked from commit 3f18463745c9c75e1fdcfacc710799838ef5c9d9)
---
 sys/dev/sdhci/sdhci_fdt_rockchip.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sys/dev/sdhci/sdhci_fdt_rockchip.c b/sys/dev/sdhci/sdhci_fdt_rockchip.c
index 79d299f75fb4..2d0ade8055e7 100644
--- a/sys/dev/sdhci/sdhci_fdt_rockchip.c
+++ b/sys/dev/sdhci/sdhci_fdt_rockchip.c
@@ -113,9 +113,6 @@ static struct ofw_compat_data compat_data[] = {
 static int
 sdhci_fdt_rockchip_probe(device_t dev)
 {
-	struct sdhci_fdt_softc *sc = device_get_softc(dev);
-
-	sc->quirks = 0;
 	if (!ofw_bus_status_okay(dev))
 		return (ENXIO);
 
@@ -130,7 +127,7 @@ sdhci_fdt_rockchip_probe(device_t dev)
 		return (ENXIO);
 	}
 
-	return (0);
+	return (BUS_PROBE_DEFAULT);
 }
 
 static int


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69ebaea9.1cbcd.52203e15>