rpmsg_virtio: Use priv data in name service callback

The callback allows us to add private data. Use that to store our rpmsg_device instance instead of extracting it from the endpoint struct. The contents of that struct are internal to the RPMsg layer. Signed-off-by: Andrew Davis <[email protected]>
OpenAMP · Mar 15, 2024 · c3ade57 · c3ade57
1 parent d9c21e1
commit c3ade57
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/lib/rpmsg/rpmsg_virtio.c b/lib/rpmsg/rpmsg_virtio.c
@@ -638,7 +638,7 @@ static void rpmsg_virtio_rx_callback(struct virtqueue *vq)
 static int rpmsg_virtio_ns_callback(struct rpmsg_endpoint *ept, void *data,
 				    size_t len, uint32_t src, void *priv)
 {
-	struct rpmsg_device *rdev = ept->rdev;
+	struct rpmsg_device *rdev = priv;
 	struct rpmsg_virtio_device *rvdev = metal_container_of(rdev,
 							       struct rpmsg_virtio_device,
 							       rdev);
@@ -649,7 +649,6 @@ static int rpmsg_virtio_ns_callback(struct rpmsg_endpoint *ept, void *data,
 	bool ept_to_release;
 	char name[RPMSG_NAME_SIZE];
 
-	(void)priv;
 	(void)src;
 
 	ns_msg = data;
@@ -966,7 +965,7 @@ int rpmsg_init_vdev_with_config(struct rpmsg_virtio_device *rvdev,
 	if (rdev->support_ns) {
 		rpmsg_register_endpoint(rdev, &rdev->ns_ept, "NS",
 				     RPMSG_NS_EPT_ADDR, RPMSG_NS_EPT_ADDR,
-				     rpmsg_virtio_ns_callback, NULL);
+				     rpmsg_virtio_ns_callback, rvdev);
 	}
 
 #ifndef VIRTIO_DEVICE_ONLY