From 59eaa4847b6cf879321d06d0400e805142148bab Mon Sep 17 00:00:00 2001 From: Ben Levinsky Date: Thu, 22 Oct 2020 08:51:05 -0700 Subject: [PATCH] apps: demos: update to hand rproc for cleanup As rproc is needed to remove virtio device from remoteproc_virtio device make sure this is handed off too Signed-off-by: Ben Levinsky --- apps/examples/echo/rpmsg-echo.c | 2 +- apps/examples/echo/rpmsg-ping.c | 2 +- apps/examples/matrix_multiply/matrix_multiply.c | 2 +- apps/examples/matrix_multiply/matrix_multiplyd.c | 2 +- apps/examples/rpc_demo/rpc_demo.c | 2 +- apps/examples/rpc_demo/rpc_demod.c | 4 ++-- apps/examples/rpmsg_sample_echo/rpmsg-sample-echo.c | 2 +- apps/examples/rpmsg_sample_echo/rpmsg-sample-ping.c | 2 +- apps/tests/msg/rpmsg-flood-ping.c | 2 +- apps/tests/msg/rpmsg-ping.c | 2 +- apps/tests/msg/rpmsg-update.c | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/examples/echo/rpmsg-echo.c b/apps/examples/echo/rpmsg-echo.c index 91c7ee47b..48fca5b58 100644 --- a/apps/examples/echo/rpmsg-echo.c +++ b/apps/examples/echo/rpmsg-echo.c @@ -104,7 +104,7 @@ int main(int argc, char *argv[]) ret = -1; } else { app(rpdev, platform); - platform_release_rpmsg_vdev(rpdev); + platform_release_rpmsg_vdev(rpdev, platform); ret = 0; } } diff --git a/apps/examples/echo/rpmsg-ping.c b/apps/examples/echo/rpmsg-ping.c index 643627cce..072809a84 100644 --- a/apps/examples/echo/rpmsg-ping.c +++ b/apps/examples/echo/rpmsg-ping.c @@ -189,7 +189,7 @@ int main(int argc, char *argv[]) ret = -1; } else { app(rpdev, platform); - platform_release_rpmsg_vdev(rpdev); + platform_release_rpmsg_vdev(rpdev, platform); ret = 0; } } diff --git a/apps/examples/matrix_multiply/matrix_multiply.c b/apps/examples/matrix_multiply/matrix_multiply.c index 1fbaf6b63..eb681526f 100644 --- a/apps/examples/matrix_multiply/matrix_multiply.c +++ b/apps/examples/matrix_multiply/matrix_multiply.c @@ -244,7 +244,7 @@ int main(int argc, char *argv[]) ret = -1; } else { app(rpdev, platform); - platform_release_rpmsg_vdev(rpdev); + platform_release_rpmsg_vdev(rpdev, platform); ret = 0; } } diff --git a/apps/examples/matrix_multiply/matrix_multiplyd.c b/apps/examples/matrix_multiply/matrix_multiplyd.c index fb2716e85..02a680a22 100644 --- a/apps/examples/matrix_multiply/matrix_multiplyd.c +++ b/apps/examples/matrix_multiply/matrix_multiplyd.c @@ -138,7 +138,7 @@ int main(int argc, char *argv[]) ret = -1; } else { app(rpdev, platform); - platform_release_rpmsg_vdev(rpdev); + platform_release_rpmsg_vdev(rpdev, platform); ret = 0; } } diff --git a/apps/examples/rpc_demo/rpc_demo.c b/apps/examples/rpc_demo/rpc_demo.c index fda5c8c7b..56b27af58 100644 --- a/apps/examples/rpc_demo/rpc_demo.c +++ b/apps/examples/rpc_demo/rpc_demo.c @@ -157,7 +157,7 @@ int main(int argc, char *argv[]) ret = -1; } else { app(rpdev, platform); - platform_release_rpmsg_vdev(rpdev); + platform_release_rpmsg_vdev(rpdev, platform); ret = 0; } } diff --git a/apps/examples/rpc_demo/rpc_demod.c b/apps/examples/rpc_demo/rpc_demod.c index e5e037bb6..8f15e2873 100644 --- a/apps/examples/rpc_demo/rpc_demod.c +++ b/apps/examples/rpc_demo/rpc_demod.c @@ -287,7 +287,7 @@ void kill_action_handler(int signum) terminate_rpc_app(); if (rpdev) - platform_release_rpmsg_vdev(rpdev); + platform_release_rpmsg_vdev(rpdev, platform); if (platform) platform_cleanup(platform); } @@ -360,7 +360,7 @@ int main(int argc, char *argv[]) ret = -1; } else { app(rpdev, platform); - platform_release_rpmsg_vdev(rpdev); + platform_release_rpmsg_vdev(rpdev, platform); ret = 0; } } diff --git a/apps/examples/rpmsg_sample_echo/rpmsg-sample-echo.c b/apps/examples/rpmsg_sample_echo/rpmsg-sample-echo.c index 75586197d..5e7787ee6 100644 --- a/apps/examples/rpmsg_sample_echo/rpmsg-sample-echo.c +++ b/apps/examples/rpmsg_sample_echo/rpmsg-sample-echo.c @@ -117,7 +117,7 @@ int main(int argc, char *argv[]) ret = -1; } else { app(rpdev, platform); - platform_release_rpmsg_vdev(rpdev); + platform_release_rpmsg_vdev(rpdev, platform); ret = 0; } } diff --git a/apps/examples/rpmsg_sample_echo/rpmsg-sample-ping.c b/apps/examples/rpmsg_sample_echo/rpmsg-sample-ping.c index 03f1893bf..0fba1ad41 100644 --- a/apps/examples/rpmsg_sample_echo/rpmsg-sample-ping.c +++ b/apps/examples/rpmsg_sample_echo/rpmsg-sample-ping.c @@ -166,7 +166,7 @@ int main(int argc, char *argv[]) ret = -1; } else { app(rpdev, platform); - platform_release_rpmsg_vdev(rpdev); + platform_release_rpmsg_vdev(rpdev, platform); ret = 0; } } diff --git a/apps/tests/msg/rpmsg-flood-ping.c b/apps/tests/msg/rpmsg-flood-ping.c index 9fb8a2231..62681c88d 100644 --- a/apps/tests/msg/rpmsg-flood-ping.c +++ b/apps/tests/msg/rpmsg-flood-ping.c @@ -207,7 +207,7 @@ int main(int argc, char *argv[]) ret = -1; } else { app(rpdev, platform); - platform_release_rpmsg_vdev(rpdev); + platform_release_rpmsg_vdev(rpdev, platform); ret = 0; } } diff --git a/apps/tests/msg/rpmsg-ping.c b/apps/tests/msg/rpmsg-ping.c index 5bbb7a065..97a8bf324 100644 --- a/apps/tests/msg/rpmsg-ping.c +++ b/apps/tests/msg/rpmsg-ping.c @@ -193,7 +193,7 @@ int main(int argc, char *argv[]) ret = -1; } else { app(rpdev, platform); - platform_release_rpmsg_vdev(rpdev); + platform_release_rpmsg_vdev(rpdev, platform); ret = 0; } } diff --git a/apps/tests/msg/rpmsg-update.c b/apps/tests/msg/rpmsg-update.c index 2d448a173..7cf8dc679 100644 --- a/apps/tests/msg/rpmsg-update.c +++ b/apps/tests/msg/rpmsg-update.c @@ -119,7 +119,7 @@ int main(int argc, char *argv[]) ret = -1; } else { app(rpdev, platform); - platform_release_rpmsg_vdev(rpdev); + platform_release_rpmsg_vdev(rpdev, platform); ret = 0; } }