Skip to content

Commit d1288b8

Browse files
rpmsg: adi: update callback API to current kernel 6.12
Signed-off-by: Arturs Artamonovs <Arturs.Artamonovs@analog.com>
1 parent 2d54986 commit d1288b8

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

drivers/rpmsg/adi_rpmsg.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -194,25 +194,25 @@ static void adi_rproc_virtio_del_vqs(struct virtio_device *vdev)
194194

195195
static int adi_rpmsg_virtio_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
196196
struct virtqueue *vqs[],
197-
vq_callback_t *callbacks[],
198-
const char * const names[],
199-
const bool *ctx,
197+
struct virtqueue_info vqs_info[],
200198
struct irq_affinity *desc)
201199
{
202-
203200
int i, ret;
204201

205202
if (nvqs != 2)
206203
return -EINVAL;
207204

208205
for (i = 0; i < nvqs; ++i) {
209-
if (!names[i]) {
206+
struct virtqueue_info *vqi = &vqs_info[i];
207+
208+
if (!vqi->name) {
210209
vqs[i] = NULL;
211210
continue;
212211
}
213212

214-
vqs[i] = adi_find_vq(vdev, i, callbacks[i], names[i],
215-
ctx ? ctx[i] : false);
213+
vqs[i] = adi_find_vq(vdev, i, vqi->callback, vqi->name,
214+
vqi->ctx);
215+
216216
if (IS_ERR(vqs[i])) {
217217
ret = PTR_ERR(vqs[i]);
218218
goto error;
@@ -560,7 +560,7 @@ static int adi_rpmsg_probe(struct platform_device *pdev)
560560
return ret;
561561
}
562562

563-
static int adi_rpmsg_remove(struct platform_device *pdev)
563+
static void adi_rpmsg_remove(struct platform_device *pdev)
564564
{
565565
struct adi_rpmsg_channel *rpchan = platform_get_drvdata(pdev);
566566
struct device *dev = &pdev->dev;
@@ -575,7 +575,6 @@ static int adi_rpmsg_remove(struct platform_device *pdev)
575575
size = rpchan->vring[0].size + rpchan->vring[1].size;
576576
dma_free_coherent(dev, size, rpchan->vring[0].va, rpchan->vring[0].da);
577577
}
578-
return 0;
579578
}
580579

581580
static const struct of_device_id adi_rpmsg_dt_ids[] = {

0 commit comments

Comments
 (0)