@@ -1195,9 +1195,7 @@ static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp)
s->cap.sdma = s->cap.adma1 = s->cap.adma2 = false;
}
- if (s->capareg == UINT64_MAX) {
- sdhci_init_capareg(s, errp);
- }
+ sdhci_init_capareg(s, errp);
}
static void sdhci_initfn(SDHCIState *s)
@@ -1347,9 +1345,6 @@ static Property sdhci_properties[] = {
DEFINE_PROP_UINT8("bus-speed", SDHCIState, cap.sdr, 0),
DEFINE_PROP_UINT8("driver-strength", SDHCIState, cap.strength, 0),
- /* capareg: deprecated */
- DEFINE_PROP_UINT64("capareg", SDHCIState, capareg, UINT64_MAX),
-
DEFINE_PROP_UINT64("maxcurr", SDHCIState, maxcurr, 0),
DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_quirk,
false),
All SDHCI consumers have been upgraded to set correct properties. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/sd/sdhci.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)