Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 083aae5a authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Greg Kroah-Hartman
Browse files

virtio_console: drop custom control queue cleanup 



[ 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: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 20e9c110

drivers/char/virtio_console.c

+0 −17
Original line number Diff line number Diff line
@@ -1993,21 +1993,6 @@ static void remove_vqs(struct ports_device *portdev) 
	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

 * device.
@@ -2168,7 +2153,6 @@ static void virtcons_remove(struct virtio_device *vdev) 
	 * have to just stop using the port, as the vqs are going

	 * away.

	 */

	remove_controlq_data(portdev);

	remove_vqs(portdev);

	kfree(portdev);

}
@@ -2213,7 +2197,6 @@ static int virtcons_freeze(struct virtio_device *vdev) 
	 */

	if (use_multiport(portdev))

		virtqueue_disable_cb(portdev->c_ivq);

	remove_controlq_data(portdev);



	list_for_each_entry(port, &portdev->ports, list) {

		virtqueue_disable_cb(port->in_vq);