git: 9b5d6ab1be32 - main - sdhci_pci(4): Remove incorrect __unused
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 08 Jan 2026 01:21:57 UTC
The branch main has been updated by marius:
URL: https://cgit.FreeBSD.org/src/commit/?id=9b5d6ab1be32772ba86021e50e709db9a1659226
commit 9b5d6ab1be32772ba86021e50e709db9a1659226
Author: Marius Strobl <marius@FreeBSD.org>
AuthorDate: 2026-01-07 22:18:21 +0000
Commit: Marius Strobl <marius@FreeBSD.org>
CommitDate: 2026-01-08 01:20:54 +0000
sdhci_pci(4): Remove incorrect __unused
The slot parameter actually is used as index into the memory resource.
Fixes: c11bbc7d
---
sys/dev/sdhci/sdhci_pci.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/sys/dev/sdhci/sdhci_pci.c b/sys/dev/sdhci/sdhci_pci.c
index 4cd007db904a..4f9bbfec50fb 100644
--- a/sys/dev/sdhci/sdhci_pci.c
+++ b/sys/dev/sdhci/sdhci_pci.c
@@ -171,7 +171,7 @@ SYSCTL_INT(_hw_sdhci, OID_AUTO, enable_msi, CTLFLAG_RDTUN, &sdhci_enable_msi,
0, "Enable MSI interrupts");
static uint8_t
-sdhci_pci_read_1(device_t dev, struct sdhci_slot *slot __unused, bus_size_t off)
+sdhci_pci_read_1(device_t dev, struct sdhci_slot *slot, bus_size_t off)
{
struct sdhci_pci_softc *sc = device_get_softc(dev);
@@ -181,8 +181,8 @@ sdhci_pci_read_1(device_t dev, struct sdhci_slot *slot __unused, bus_size_t off)
}
static void
-sdhci_pci_write_1(device_t dev, struct sdhci_slot *slot __unused,
- bus_size_t off, uint8_t val)
+sdhci_pci_write_1(device_t dev, struct sdhci_slot *slot, bus_size_t off,
+ uint8_t val)
{
struct sdhci_pci_softc *sc = device_get_softc(dev);
@@ -192,7 +192,7 @@ sdhci_pci_write_1(device_t dev, struct sdhci_slot *slot __unused,
}
static uint16_t
-sdhci_pci_read_2(device_t dev, struct sdhci_slot *slot __unused, bus_size_t off)
+sdhci_pci_read_2(device_t dev, struct sdhci_slot *slot, bus_size_t off)
{
struct sdhci_pci_softc *sc = device_get_softc(dev);
@@ -202,8 +202,8 @@ sdhci_pci_read_2(device_t dev, struct sdhci_slot *slot __unused, bus_size_t off)
}
static void
-sdhci_pci_write_2(device_t dev, struct sdhci_slot *slot __unused,
- bus_size_t off, uint16_t val)
+sdhci_pci_write_2(device_t dev, struct sdhci_slot *slot, bus_size_t off,
+ uint16_t val)
{
struct sdhci_pci_softc *sc = device_get_softc(dev);
@@ -213,7 +213,7 @@ sdhci_pci_write_2(device_t dev, struct sdhci_slot *slot __unused,
}
static uint32_t
-sdhci_pci_read_4(device_t dev, struct sdhci_slot *slot __unused, bus_size_t off)
+sdhci_pci_read_4(device_t dev, struct sdhci_slot *slot, bus_size_t off)
{
struct sdhci_pci_softc *sc = device_get_softc(dev);
@@ -223,8 +223,8 @@ sdhci_pci_read_4(device_t dev, struct sdhci_slot *slot __unused, bus_size_t off)
}
static void
-sdhci_pci_write_4(device_t dev, struct sdhci_slot *slot __unused,
- bus_size_t off, uint32_t val)
+sdhci_pci_write_4(device_t dev, struct sdhci_slot *slot, bus_size_t off,
+ uint32_t val)
{
struct sdhci_pci_softc *sc = device_get_softc(dev);
@@ -234,8 +234,8 @@ sdhci_pci_write_4(device_t dev, struct sdhci_slot *slot __unused,
}
static void
-sdhci_pci_read_multi_4(device_t dev, struct sdhci_slot *slot __unused,
- bus_size_t off, uint32_t *data, bus_size_t count)
+sdhci_pci_read_multi_4(device_t dev, struct sdhci_slot *slot, bus_size_t off,
+ uint32_t *data, bus_size_t count)
{
struct sdhci_pci_softc *sc = device_get_softc(dev);
@@ -243,8 +243,8 @@ sdhci_pci_read_multi_4(device_t dev, struct sdhci_slot *slot __unused,
}
static void
-sdhci_pci_write_multi_4(device_t dev, struct sdhci_slot *slot __unused,
- bus_size_t off, uint32_t *data, bus_size_t count)
+sdhci_pci_write_multi_4(device_t dev, struct sdhci_slot *slot, bus_size_t off,
+ uint32_t *data, bus_size_t count)
{
struct sdhci_pci_softc *sc = device_get_softc(dev);