Module Name: src
Committed By: jmcneill
Date: Sun Feb 16 11:03:31 UTC 2025
Modified Files:
src/sys/dev/sdmmc: sdhc.c sdhcvar.h
Log Message:
sdhc: Remove now unused sc_write_delay
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/sdmmc/sdhcvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.119 src/sys/dev/sdmmc/sdhc.c:1.120
--- src/sys/dev/sdmmc/sdhc.c:1.119 Thu May 9 01:33:13 2024
+++ src/sys/dev/sdmmc/sdhc.c Sun Feb 16 11:03:30 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.119 2024/05/09 01:33:13 dyoung Exp $ */
+/* $NetBSD: sdhc.c,v 1.120 2025/02/16 11:03:30 jmcneill Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.119 2024/05/09 01:33:13 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.120 2025/02/16 11:03:30 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -142,9 +142,6 @@ hwrite1(struct sdhc_host *hp, bus_size_t
tmp = (val << shift) | (tmp & ~(0xffU << shift));
bus_space_write_4(hp->iot, hp->ioh, o, tmp);
}
- if (hp->sc->sc_write_delay != 0) {
- delay(hp->sc->sc_write_delay);
- }
}
static void
@@ -160,9 +157,6 @@ hwrite2(struct sdhc_host *hp, bus_size_t
tmp = (val << shift) | (tmp & ~(0xffffU << shift));
bus_space_write_4(hp->iot, hp->ioh, o, tmp);
}
- if (hp->sc->sc_write_delay != 0) {
- delay(hp->sc->sc_write_delay);
- }
}
static void
@@ -170,9 +164,6 @@ hwrite4(struct sdhc_host *hp, bus_size_t
{
bus_space_write_4(hp->iot, hp->ioh, o, val);
- if (hp->sc->sc_write_delay != 0) {
- delay(hp->sc->sc_write_delay);
- }
}
#define HWRITE1(hp, reg, val) hwrite1(hp, reg, val)
Index: src/sys/dev/sdmmc/sdhcvar.h
diff -u src/sys/dev/sdmmc/sdhcvar.h:1.35 src/sys/dev/sdmmc/sdhcvar.h:1.36
--- src/sys/dev/sdmmc/sdhcvar.h:1.35 Thu May 9 01:33:13 2024
+++ src/sys/dev/sdmmc/sdhcvar.h Sun Feb 16 11:03:31 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhcvar.h,v 1.35 2024/05/09 01:33:13 dyoung Exp $ */
+/* $NetBSD: sdhcvar.h,v 1.36 2025/02/16 11:03:31 jmcneill Exp $ */
/* $OpenBSD: sdhcvar.h,v 1.3 2007/09/06 08:01:01 jsg Exp $ */
/*
@@ -86,8 +86,6 @@ struct sdhc_softc {
int (*sc_vendor_transfer_data_dma)(struct sdhc_softc *, struct sdmmc_command *);
void (*sc_vendor_hw_reset)(struct sdhc_softc *, struct sdhc_host *);
int (*sc_vendor_signal_voltage)(struct sdhc_softc *, int);
-
- u_int sc_write_delay; /* delay (us) after io write */
};
/* Host controller functions called by the attachment driver. */
