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

Commit f7ad26ff authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Michael S. Tsirkin
Browse files

virtio: make find_vqs() checkpatch.pl-friendly 



checkpatch.pl wants arrays of strings declared as follows:

  static const char * const names[] = { "vq-1", "vq-2", "vq-3" };

Currently the find_vqs() function takes a const char *names[] argument
so passing checkpatch.pl's const char * const names[] results in a
compiler error due to losing the second const.

This patch adjusts the find_vqs() prototype and updates all virtio
transports.  This makes it possible for virtio_balloon.c, virtio_input.c,
virtgpu_kms.c, and virtio_rpmsg_bus.c to use the checkpatch.pl-friendly
type.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarBjorn Andersson <bjorn.andersson@sonymobile.com>
parent 21ea9fb6

drivers/gpu/drm/virtio/virtgpu_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ int virtio_gpu_driver_load(struct drm_device *dev, unsigned long flags) 
	static vq_callback_t *callbacks[] = {

		virtio_gpu_ctrl_ack, virtio_gpu_cursor_ack

	};

	static const char *names[] = { "control", "cursor" };

	static const char * const names[] = { "control", "cursor" };



	struct virtio_gpu_device *vgdev;

	/* this will expand later */

drivers/misc/mic/card/mic_virtio.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ static struct virtqueue *mic_find_vq(struct virtio_device *vdev, 
static int mic_find_vqs(struct virtio_device *vdev, unsigned nvqs,

			struct virtqueue *vqs[],

			vq_callback_t *callbacks[],

			const char *names[])

			const char * const names[])

{

	struct mic_vdev *mvdev = to_micvdev(vdev);

	struct mic_device_ctrl __iomem *dc = mvdev->dc;

drivers/remoteproc/remoteproc_virtio.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static void rproc_virtio_del_vqs(struct virtio_device *vdev) 
static int rproc_virtio_find_vqs(struct virtio_device *vdev, unsigned nvqs,

		       struct virtqueue *vqs[],

		       vq_callback_t *callbacks[],

		       const char *names[])

		       const char * const names[])

{

	struct rproc *rproc = vdev_to_rproc(vdev);

	int i, ret;

drivers/rpmsg/virtio_rpmsg_bus.c

+1 −1
Original line number Diff line number Diff line
@@ -945,7 +945,7 @@ static void rpmsg_ns_cb(struct rpmsg_channel *rpdev, void *data, int len, 
static int rpmsg_probe(struct virtio_device *vdev)

{

	vq_callback_t *vq_cbs[] = { rpmsg_recv_done, rpmsg_xmit_done };

	const char *names[] = { "input", "output" };

	static const char * const names[] = { "input", "output" };

	struct virtqueue *vqs[2];

	struct virtproc_info *vrp;

	void *bufs_va;

drivers/s390/virtio/kvm_virtio.c

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static void kvm_del_vqs(struct virtio_device *vdev) 
static int kvm_find_vqs(struct virtio_device *vdev, unsigned nvqs,

			struct virtqueue *vqs[],

			vq_callback_t *callbacks[],

			const char *names[])

			const char * const names[])

{

	struct kvm_device *kdev = to_kvmdev(vdev);

	int i;