| Message ID | 20180108154303.6522-27-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | SDHCI: make it abstract, add inherited devices, add qtests | expand |
On Mon, Jan 8, 2018 at 7:42 AM, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > All SDHCI consumers have been upgraded to set correct properties. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> Alistair > --- > hw/sd/sdhci.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c > index 34bda73b66..ae914a6ef9 100644 > --- a/hw/sd/sdhci.c > +++ b/hw/sd/sdhci.c > @@ -1194,9 +1194,7 @@ static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp) > } > s->version = (SDHC_HCVER_VENDOR << 8) | (s->spec_version - 1); > > - if (s->capareg == UINT64_MAX) { > - sdhci_init_capareg(s, errp); > - } > + sdhci_init_capareg(s, errp); > } > > static void sdhci_initfn(SDHCIState *s) > @@ -1345,9 +1343,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), > -- > 2.15.1 > >
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 34bda73b66..ae914a6ef9 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1194,9 +1194,7 @@ static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp) } s->version = (SDHC_HCVER_VENDOR << 8) | (s->spec_version - 1); - if (s->capareg == UINT64_MAX) { - sdhci_init_capareg(s, errp); - } + sdhci_init_capareg(s, errp); } static void sdhci_initfn(SDHCIState *s) @@ -1345,9 +1343,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(-)