Skip to content

Commit

Permalink
virtio: make find_vqs() checkpatch.pl-friendly
Browse files Browse the repository at this point in the history 
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: Stefan Hajnoczi <[email protected]>
Signed-off-by: Michael S. Tsirkin <[email protected]>
Acked-by: Bjorn Andersson <[email protected]>
  • Loading branch information
@stefanhaRH @mstsirkin
stefanhaRH authored and mstsirkin committed Jan 12, 2016
1 parent 21ea9fb commit f7ad26f
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/virtio/virtgpu_kms.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/mic/card/mic_virtio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/remoteproc/remoteproc_virtio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/rpmsg/virtio_rpmsg_bus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/s390/virtio/kvm_virtio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/s390/virtio/virtio_ccw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ static int virtio_ccw_register_adapter_ind(struct virtio_ccw_device *vcdev,
static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs,
struct virtqueue *vqs[],
vq_callback_t *callbacks[],
const char *names[])
const char * const names[])
{
struct virtio_ccw_device *vcdev = to_vc_device(vdev);
unsigned long *indicatorp = NULL;
Expand Down
2 changes: 1 addition & 1 deletion drivers/virtio/virtio_balloon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ static int init_vqs(struct virtio_balloon *vb)
{
struct virtqueue *vqs[3];
vq_callback_t *callbacks[] = { balloon_ack, balloon_ack, stats_request };
const char *names[] = { "inflate", "deflate", "stats" };
static const char * const names[] = { "inflate", "deflate", "stats" };
int err, nvqs;

/*
Expand Down
2 changes: 1 addition & 1 deletion drivers/virtio/virtio_input.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ static int virtinput_init_vqs(struct virtio_input *vi)
struct virtqueue *vqs[2];
vq_callback_t *cbs[] = { virtinput_recv_events,
virtinput_recv_status };
static const char *names[] = { "events", "status" };
static const char * const names[] = { "events", "status" };
int err;

err = vi->vdev->config->find_vqs(vi->vdev, 2, vqs, cbs, names);
Expand Down
2 changes: 1 addition & 1 deletion drivers/virtio/virtio_mmio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned index,
static int vm_find_vqs(struct virtio_device *vdev, unsigned nvqs,
struct virtqueue *vqs[],
vq_callback_t *callbacks[],
const char *names[])
const char * const names[])
{
struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
unsigned int irq = platform_get_irq(vm_dev->pdev, 0);
Expand Down
4 changes: 2 additions & 2 deletions drivers/virtio/virtio_pci_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ void vp_del_vqs(struct virtio_device *vdev)
static int vp_try_to_find_vqs(struct virtio_device *vdev, unsigned nvqs,
struct virtqueue *vqs[],
vq_callback_t *callbacks[],
const char *names[],
const char * const names[],
bool use_msix,
bool per_vq_vectors)
{
Expand Down Expand Up @@ -376,7 +376,7 @@ static int vp_try_to_find_vqs(struct virtio_device *vdev, unsigned nvqs,
int vp_find_vqs(struct virtio_device *vdev, unsigned nvqs,
struct virtqueue *vqs[],
vq_callback_t *callbacks[],
const char *names[])
const char * const names[])
{
int err;

Expand Down
2 changes: 1 addition & 1 deletion drivers/virtio/virtio_pci_common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ void vp_del_vqs(struct virtio_device *vdev);
int vp_find_vqs(struct virtio_device *vdev, unsigned nvqs,
struct virtqueue *vqs[],
vq_callback_t *callbacks[],
const char *names[]);
const char * const names[]);
const char *vp_bus_name(struct virtio_device *vdev);

/* Setup the affinity for a virtqueue:
Expand Down
2 changes: 1 addition & 1 deletion drivers/virtio/virtio_pci_modern.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,
static int vp_modern_find_vqs(struct virtio_device *vdev, unsigned nvqs,
struct virtqueue *vqs[],
vq_callback_t *callbacks[],
const char *names[])
const char * const names[])
{
struct virtio_pci_device *vp_dev = to_vp_device(vdev);
struct virtqueue *vq;
Expand Down
2 changes: 1 addition & 1 deletion include/linux/virtio_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ struct virtio_config_ops {
int (*find_vqs)(struct virtio_device *, unsigned nvqs,
struct virtqueue *vqs[],
vq_callback_t *callbacks[],
const char *names[]);
const char * const names[]);
void (*del_vqs)(struct virtio_device *);
u64 (*get_features)(struct virtio_device *vdev);
int (*finalize_features)(struct virtio_device *vdev);
Expand Down

0 comments on commit f7ad26f

Please sign in to comment.