[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 19/33] hw/sd/pl181.c & omap_mmc.c: remove device_
From: |
Damien Hedde |
Subject: |
[Qemu-block] [PATCH v3 19/33] hw/sd/pl181.c & omap_mmc.c: remove device_legacy_reset call |
Date: |
Mon, 29 Jul 2019 16:56:40 +0200 |
Replace legacy's reset call by device_reset_warm.
The new function propagates also the reset to the sub-buses tree but this has
no impact since SDState has no child bus.
Signed-off-by: Damien Hedde <address@hidden>
---
hw/sd/omap_mmc.c | 2 +-
hw/sd/pl181.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c
index 24a1edc149..3021e54b8d 100644
--- a/hw/sd/omap_mmc.c
+++ b/hw/sd/omap_mmc.c
@@ -317,7 +317,7 @@ void omap_mmc_reset(struct omap_mmc_s *host)
* into any bus, and we must reset it manually. When omap_mmc is
* QOMified this must move into the QOM reset function.
*/
- device_legacy_reset(DEVICE(host->card));
+ device_reset_warm(DEVICE(host->card));
}
static uint64_t omap_mmc_read(void *opaque, hwaddr offset,
diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c
index 15b4aaa67f..a59ef7eb2a 100644
--- a/hw/sd/pl181.c
+++ b/hw/sd/pl181.c
@@ -480,7 +480,7 @@ static void pl181_reset(DeviceState *d)
/* Since we're still using the legacy SD API the card is not plugged
* into any bus, and we must reset it manually.
*/
- device_legacy_reset(DEVICE(s->card));
+ device_reset_warm(DEVICE(s->card));
}
static void pl181_init(Object *obj)
--
2.22.0
- [Qemu-block] [PATCH v3 00/33] Multi-phase reset mechanism, Damien Hedde, 2019/07/29
- [Qemu-block] [PATCH v3 18/33] hw/audio/intel-hda.c: remove device_legacy_reset call, Damien Hedde, 2019/07/29
- [Qemu-block] [PATCH v3 19/33] hw/sd/pl181.c & omap_mmc.c: remove device_legacy_reset call,
Damien Hedde <=
- [Qemu-block] [PATCH v3 16/33] hw/input/adb.c: remove qdev_reset_all call, Damien Hedde, 2019/07/29
- [Qemu-block] [PATCH v3 13/33] hw/scsi/: remove qdev/qbus_reset_all call, Damien Hedde, 2019/07/29
- [Qemu-block] [PATCH v3 28/33] qdev: Remove unused deprecated reset functions, Damien Hedde, 2019/07/29
- [Qemu-block] [PATCH v3 27/33] hw/ide/microdrive.c: remove device_legacy_reset calls, Damien Hedde, 2019/07/29
- [Qemu-block] [PATCH v3 33/33] Connect the uart reset gpios in the zynq platform, Damien Hedde, 2019/07/29
- [Qemu-block] [PATCH v3 02/33] add temporary device_legacy_reset function to replace device_reset, Damien Hedde, 2019/07/29
- [Qemu-block] [PATCH v3 10/33] vl.c: remove qbus_reset_all registration, Damien Hedde, 2019/07/29
- [Qemu-block] [PATCH v3 26/33] hw/s390x/s390-pci-inst.c: remove device_legacy_reset call, Damien Hedde, 2019/07/29
- [Qemu-block] [PATCH v3 04/33] make Device and Bus Resettable, Damien Hedde, 2019/07/29