diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2021-10-13 06:55:44 -0400 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2022-01-14 18:50:52 -0500 |
| commit | d9679d0013a66849f23057978f92e76b255c50aa (patch) | |
| tree | 82edbfe8a2775e5cb7cbb5b560dd189067cc3db3 /drivers/char | |
| parent | c9e6606c7fe92b50a02ce51dda82586ebdf99b48 (diff) | |
| download | linux-d9679d0013a66849f23057978f92e76b255c50aa.tar.gz linux-d9679d0013a66849f23057978f92e76b255c50aa.tar.bz2 linux-d9679d0013a66849f23057978f92e76b255c50aa.zip | |
virtio: wrap config->reset calls
This will enable cleanups down the road.
The idea is to disable cbs, then add "flush_queued_cbs" callback
as a parameter, this way drivers can flush any work
queued after callbacks have been disabled.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Link: https://lore.kernel.org/r/20211013105226.20225-1-mst@redhat.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/hw_random/virtio-rng.c | 2 | ||||
| -rw-r--r-- | drivers/char/virtio_console.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c index 0a7dde135db1..b2bf78b25630 100644 --- a/drivers/char/hw_random/virtio-rng.c +++ b/drivers/char/hw_random/virtio-rng.c @@ -179,7 +179,7 @@ static void remove_common(struct virtio_device *vdev) vi->data_avail = 0; vi->data_idx = 0; complete(&vi->have_data); - vdev->config->reset(vdev); + virtio_reset_device(vdev); if (vi->hwrng_register_done) hwrng_unregister(&vi->hwrng); vdev->config->del_vqs(vdev); diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index 660c5c388c29..2359889a35a0 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -1958,7 +1958,7 @@ static void virtcons_remove(struct virtio_device *vdev) spin_unlock_irq(&pdrvdata_lock); /* Disable interrupts for vqs */ - vdev->config->reset(vdev); + virtio_reset_device(vdev); /* Finish up work that's lined up */ if (use_multiport(portdev)) cancel_work_sync(&portdev->control_work); @@ -2148,7 +2148,7 @@ static int virtcons_freeze(struct virtio_device *vdev) portdev = vdev->priv; - vdev->config->reset(vdev); + virtio_reset_device(vdev); if (use_multiport(portdev)) virtqueue_disable_cb(portdev->c_ivq); |