evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

virtio_console: drop custom control queue cleanup

Browse source 
[ Upstream commit 61a8950c5c5708cf2068b29ffde94e454e528208 ]

We now cleanup all VQs on device removal - no need
to handle the control VQ specially.

Cc: stable@vger.kernel.org
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Michael S. Tsirkin 2018-04-20 20:49:04 +03:00 • committed by Greg Kroah-Hartman
parent ba9e2c1190
commit fa3c628897
1 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/char/virtio_console.c
View file

@ -1987,21 +1987,6 @@ static void remove_vqs(struct ports_device *portdev)
kfree(portdev->out_vqs); kfree(portdev->out_vqs);
} }
static void remove_controlq_data(struct ports_device *portdev)
{
struct port_buffer *buf;
unsigned int len;
if (!use_multiport(portdev))
return;
while ((buf = virtqueue_get_buf(portdev->c_ivq, &len)))
free_buf(buf, true);
while ((buf = virtqueue_detach_unused_buf(portdev->c_ivq)))
free_buf(buf, true);
}
/* /*
* Once we're further in boot, we get probed like any other virtio * Once we're further in boot, we get probed like any other virtio
* device. * device.
@ -2162,7 +2147,6 @@ static void virtcons_remove(struct virtio_device *vdev)
* have to just stop using the port, as the vqs are going * have to just stop using the port, as the vqs are going
* away. * away.
*/ */
remove_controlq_data(portdev);
remove_vqs(portdev); remove_vqs(portdev);
kfree(portdev); kfree(portdev);
} }
@ -2207,7 +2191,6 @@ static int virtcons_freeze(struct virtio_device *vdev)
*/ */
if (use_multiport(portdev)) if (use_multiport(portdev))
virtqueue_disable_cb(portdev->c_ivq); virtqueue_disable_cb(portdev->c_ivq);
remove_controlq_data(portdev);
list_for_each_entry(port, &portdev->ports, list) { list_for_each_entry(port, &portdev->ports, list) {
virtqueue_disable_cb(port->in_vq); virtqueue_disable_cb(port->in_vq);