@@ -194,25 +194,25 @@ static void adi_rproc_virtio_del_vqs(struct virtio_device *vdev)
194
194
195
195
static int adi_rpmsg_virtio_find_vqs (struct virtio_device * vdev , unsigned int nvqs ,
196
196
struct virtqueue * vqs [],
197
- vq_callback_t * callbacks [],
198
- const char * const names [],
199
- const bool * ctx ,
197
+ struct virtqueue_info vqs_info [],
200
198
struct irq_affinity * desc )
201
199
{
202
-
203
200
int i , ret ;
204
201
205
202
if (nvqs != 2 )
206
203
return - EINVAL ;
207
204
208
205
for (i = 0 ; i < nvqs ; ++ i ) {
209
- if (!names [i ]) {
206
+ struct virtqueue_info * vqi = & vqs_info [i ];
207
+
208
+ if (!vqi -> name ) {
210
209
vqs [i ] = NULL ;
211
210
continue ;
212
211
}
213
212
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
+
216
216
if (IS_ERR (vqs [i ])) {
217
217
ret = PTR_ERR (vqs [i ]);
218
218
goto error ;
@@ -560,7 +560,7 @@ static int adi_rpmsg_probe(struct platform_device *pdev)
560
560
return ret ;
561
561
}
562
562
563
- static int adi_rpmsg_remove (struct platform_device * pdev )
563
+ static void adi_rpmsg_remove (struct platform_device * pdev )
564
564
{
565
565
struct adi_rpmsg_channel * rpchan = platform_get_drvdata (pdev );
566
566
struct device * dev = & pdev -> dev ;
@@ -575,7 +575,6 @@ static int adi_rpmsg_remove(struct platform_device *pdev)
575
575
size = rpchan -> vring [0 ].size + rpchan -> vring [1 ].size ;
576
576
dma_free_coherent (dev , size , rpchan -> vring [0 ].va , rpchan -> vring [0 ].da );
577
577
}
578
- return 0 ;
579
578
}
580
579
581
580
static const struct of_device_id adi_rpmsg_dt_ids [] = {
0 commit comments