Skip to content

Commit 3c93b57

Browse files
Jiri Pirkomstsirkin
Jiri Pirko
authored and
mstsirkin
committed
virtio: convert find_vqs() op implementations to find_vqs_info()
Convert existing find_vqs() transport implementations to use find_vqs_info() config op. Signed-off-by: Jiri Pirko <[email protected]> Message-Id: <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]>
1 parent ad9a125 commit 3c93b57

File tree

6 files changed

+42
-42
lines changed

6 files changed

+42
-42
lines changed

‎arch/um/drivers/virtio_uml.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,8 +1014,8 @@ static struct virtqueue *vu_setup_vq(struct virtio_device *vdev,
10141014
}
10151015

10161016
static int vu_find_vqs(struct virtio_device *vdev, unsigned nvqs,
1017-
struct virtqueue *vqs[], vq_callback_t *callbacks[],
1018-
const char * const names[], const bool *ctx,
1017+
struct virtqueue *vqs[],
1018+
struct virtqueue_info vqs_info[],
10191019
struct irq_affinity *desc)
10201020
{
10211021
struct virtio_uml_device *vu_dev = to_virtio_uml_device(vdev);
@@ -1031,13 +1031,15 @@ static int vu_find_vqs(struct virtio_device *vdev, unsigned nvqs,
10311031
return rc;
10321032

10331033
for (i = 0; i < nvqs; ++i) {
1034-
if (!names[i]) {
1034+
struct virtqueue_info *vqi = &vqs_info[i];
1035+
1036+
if (!vqi->name) {
10351037
vqs[i] = NULL;
10361038
continue;
10371039
}
10381040

1039-
vqs[i] = vu_setup_vq(vdev, queue_idx++, callbacks[i], names[i],
1040-
ctx ? ctx[i] : false);
1041+
vqs[i] = vu_setup_vq(vdev, queue_idx++, vqi->callback,
1042+
vqi->name, vqi->ctx);
10411043
if (IS_ERR(vqs[i])) {
10421044
rc = PTR_ERR(vqs[i]);
10431045
goto error_setup;
@@ -1097,7 +1099,7 @@ static const struct virtio_config_ops virtio_uml_config_ops = {
10971099
.get_status = vu_get_status,
10981100
.set_status = vu_set_status,
10991101
.reset = vu_reset,
1100-
.find_vqs = vu_find_vqs,
1102+
.find_vqs_info = vu_find_vqs,
11011103
.del_vqs = vu_del_vqs,
11021104
.get_features = vu_get_features,
11031105
.finalize_features = vu_finalize_features,

‎drivers/platform/mellanox/mlxbf-tmfifo.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,9 +1058,7 @@ static void mlxbf_tmfifo_virtio_del_vqs(struct virtio_device *vdev)
10581058
static int mlxbf_tmfifo_virtio_find_vqs(struct virtio_device *vdev,
10591059
unsigned int nvqs,
10601060
struct virtqueue *vqs[],
1061-
vq_callback_t *callbacks[],
1062-
const char * const names[],
1063-
const bool *ctx,
1061+
struct virtqueue_info vqs_info[],
10641062
struct irq_affinity *desc)
10651063
{
10661064
struct mlxbf_tmfifo_vdev *tm_vdev = mlxbf_vdev_to_tmfifo(vdev);
@@ -1072,7 +1070,9 @@ static int mlxbf_tmfifo_virtio_find_vqs(struct virtio_device *vdev,
10721070
return -EINVAL;
10731071

10741072
for (i = 0; i < nvqs; ++i) {
1075-
if (!names[i]) {
1073+
struct virtqueue_info *vqi = &vqs_info[i];
1074+
1075+
if (!vqi->name) {
10761076
ret = -EINVAL;
10771077
goto error;
10781078
}
@@ -1084,7 +1084,7 @@ static int mlxbf_tmfifo_virtio_find_vqs(struct virtio_device *vdev,
10841084
vq = vring_new_virtqueue(i, vring->num, vring->align, vdev,
10851085
false, false, vring->va,
10861086
mlxbf_tmfifo_virtio_notify,
1087-
callbacks[i], names[i]);
1087+
vqi->callback, vqi->name);
10881088
if (!vq) {
10891089
dev_err(&vdev->dev, "vring_new_virtqueue failed\n");
10901090
ret = -ENOMEM;
@@ -1175,7 +1175,7 @@ static void tmfifo_virtio_dev_release(struct device *device)
11751175
static const struct virtio_config_ops mlxbf_tmfifo_virtio_config_ops = {
11761176
.get_features = mlxbf_tmfifo_virtio_get_features,
11771177
.finalize_features = mlxbf_tmfifo_virtio_finalize_features,
1178-
.find_vqs = mlxbf_tmfifo_virtio_find_vqs,
1178+
.find_vqs_info = mlxbf_tmfifo_virtio_find_vqs,
11791179
.del_vqs = mlxbf_tmfifo_virtio_del_vqs,
11801180
.reset = mlxbf_tmfifo_virtio_reset,
11811181
.set_status = mlxbf_tmfifo_virtio_set_status,

‎drivers/remoteproc/remoteproc_virtio.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -182,21 +182,21 @@ static void rproc_virtio_del_vqs(struct virtio_device *vdev)
182182

183183
static int rproc_virtio_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
184184
struct virtqueue *vqs[],
185-
vq_callback_t *callbacks[],
186-
const char * const names[],
187-
const bool * ctx,
185+
struct virtqueue_info vqs_info[],
188186
struct irq_affinity *desc)
189187
{
190188
int i, ret, queue_idx = 0;
191189

192190
for (i = 0; i < nvqs; ++i) {
193-
if (!names[i]) {
191+
struct virtqueue_info *vqi = &vqs_info[i];
192+
193+
if (!vqi->name) {
194194
vqs[i] = NULL;
195195
continue;
196196
}
197197

198-
vqs[i] = rp_find_vq(vdev, queue_idx++, callbacks[i], names[i],
199-
ctx ? ctx[i] : false);
198+
vqs[i] = rp_find_vq(vdev, queue_idx++, vqi->callback,
199+
vqi->name, vqi->ctx);
200200
if (IS_ERR(vqs[i])) {
201201
ret = PTR_ERR(vqs[i]);
202202
goto error;
@@ -327,7 +327,7 @@ static void rproc_virtio_set(struct virtio_device *vdev, unsigned int offset,
327327
static const struct virtio_config_ops rproc_virtio_config_ops = {
328328
.get_features = rproc_virtio_get_features,
329329
.finalize_features = rproc_virtio_finalize_features,
330-
.find_vqs = rproc_virtio_find_vqs,
330+
.find_vqs_info = rproc_virtio_find_vqs,
331331
.del_vqs = rproc_virtio_del_vqs,
332332
.reset = rproc_virtio_reset,
333333
.set_status = rproc_virtio_set_status,

‎drivers/s390/virtio/virtio_ccw.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -689,9 +689,7 @@ static int virtio_ccw_register_adapter_ind(struct virtio_ccw_device *vcdev,
689689

690690
static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs,
691691
struct virtqueue *vqs[],
692-
vq_callback_t *callbacks[],
693-
const char * const names[],
694-
const bool *ctx,
692+
struct virtqueue_info vqs_info[],
695693
struct irq_affinity *desc)
696694
{
697695
struct virtio_ccw_device *vcdev = to_vc_device(vdev);
@@ -705,14 +703,15 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs,
705703
return -ENOMEM;
706704

707705
for (i = 0; i < nvqs; ++i) {
708-
if (!names[i]) {
706+
struct virtqueue_info *vqi = &vqs_info[i];
707+
708+
if (!vqi->name) {
709709
vqs[i] = NULL;
710710
continue;
711711
}
712712

713-
vqs[i] = virtio_ccw_setup_vq(vdev, queue_idx++, callbacks[i],
714-
names[i], ctx ? ctx[i] : false,
715-
ccw);
713+
vqs[i] = virtio_ccw_setup_vq(vdev, queue_idx++, vqi->callback,
714+
vqi->name, vqi->ctx, ccw);
716715
if (IS_ERR(vqs[i])) {
717716
ret = PTR_ERR(vqs[i]);
718717
vqs[i] = NULL;
@@ -1079,7 +1078,7 @@ static const struct virtio_config_ops virtio_ccw_config_ops = {
10791078
.get_status = virtio_ccw_get_status,
10801079
.set_status = virtio_ccw_set_status,
10811080
.reset = virtio_ccw_reset,
1082-
.find_vqs = virtio_ccw_find_vqs,
1081+
.find_vqs_info = virtio_ccw_find_vqs,
10831082
.del_vqs = virtio_ccw_del_vqs,
10841083
.bus_name = virtio_ccw_bus_name,
10851084
.synchronize_cbs = virtio_ccw_synchronize_cbs,

‎drivers/virtio/virtio_mmio.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -489,9 +489,7 @@ static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned int in
489489

490490
static int vm_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
491491
struct virtqueue *vqs[],
492-
vq_callback_t *callbacks[],
493-
const char * const names[],
494-
const bool *ctx,
492+
struct virtqueue_info vqs_info[],
495493
struct irq_affinity *desc)
496494
{
497495
struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
@@ -510,13 +508,15 @@ static int vm_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
510508
enable_irq_wake(irq);
511509

512510
for (i = 0; i < nvqs; ++i) {
513-
if (!names[i]) {
511+
struct virtqueue_info *vqi = &vqs_info[i];
512+
513+
if (!vqi->name) {
514514
vqs[i] = NULL;
515515
continue;
516516
}
517517

518-
vqs[i] = vm_setup_vq(vdev, queue_idx++, callbacks[i], names[i],
519-
ctx ? ctx[i] : false);
518+
vqs[i] = vm_setup_vq(vdev, queue_idx++, vqi->callback,
519+
vqi->name, vqi->ctx);
520520
if (IS_ERR(vqs[i])) {
521521
vm_del_vqs(vdev);
522522
return PTR_ERR(vqs[i]);
@@ -570,7 +570,7 @@ static const struct virtio_config_ops virtio_mmio_config_ops = {
570570
.get_status = vm_get_status,
571571
.set_status = vm_set_status,
572572
.reset = vm_reset,
573-
.find_vqs = vm_find_vqs,
573+
.find_vqs_info = vm_find_vqs,
574574
.del_vqs = vm_del_vqs,
575575
.get_features = vm_get_features,
576576
.finalize_features = vm_finalize_features,

‎drivers/virtio/virtio_vdpa.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -358,9 +358,7 @@ create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd)
358358

359359
static int virtio_vdpa_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
360360
struct virtqueue *vqs[],
361-
vq_callback_t *callbacks[],
362-
const char * const names[],
363-
const bool *ctx,
361+
struct virtqueue_info vqs_info[],
364362
struct irq_affinity *desc)
365363
{
366364
struct virtio_vdpa_device *vd_dev = to_virtio_vdpa_device(vdev);
@@ -379,14 +377,15 @@ static int virtio_vdpa_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
379377
}
380378

381379
for (i = 0; i < nvqs; ++i) {
382-
if (!names[i]) {
380+
struct virtqueue_info *vqi = &vqs_info[i];
381+
382+
if (!vqi->name) {
383383
vqs[i] = NULL;
384384
continue;
385385
}
386386

387-
vqs[i] = virtio_vdpa_setup_vq(vdev, queue_idx++,
388-
callbacks[i], names[i], ctx ?
389-
ctx[i] : false);
387+
vqs[i] = virtio_vdpa_setup_vq(vdev, queue_idx++, vqi->callback,
388+
vqi->name, vqi->ctx);
390389
if (IS_ERR(vqs[i])) {
391390
err = PTR_ERR(vqs[i]);
392391
goto err_setup_vq;
@@ -470,7 +469,7 @@ static const struct virtio_config_ops virtio_vdpa_config_ops = {
470469
.get_status = virtio_vdpa_get_status,
471470
.set_status = virtio_vdpa_set_status,
472471
.reset = virtio_vdpa_reset,
473-
.find_vqs = virtio_vdpa_find_vqs,
472+
.find_vqs_info = virtio_vdpa_find_vqs,
474473
.del_vqs = virtio_vdpa_del_vqs,
475474
.get_features = virtio_vdpa_get_features,
476475
.finalize_features = virtio_vdpa_finalize_features,

0 commit comments

Comments
 (0)