2019-01-07 11:42:29

by Pi-Hsun Shih

Subject: [PATCH] rpmsg: core: Make remove handler for rpmsg driver optional.

Most other bus (for example, SPI, i2c) have the remove handler for
driver optional. Make remove handler for rpmsg driver optional too.

Signed-off-by: Pi-Hsun Shih <[email protected]>
---
drivers/rpmsg/rpmsg_core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/rpmsg/rpmsg_core.c b/drivers/rpmsg/rpmsg_core.c
index 8122807db38094..ea88fd4e2a6ecf 100644
--- a/drivers/rpmsg/rpmsg_core.c
+++ b/drivers/rpmsg/rpmsg_core.c
@@ -493,7 +493,8 @@ static int rpmsg_dev_remove(struct device *dev)
if (rpdev->ops->announce_destroy)
err = rpdev->ops->announce_destroy(rpdev);

- rpdrv->remove(rpdev);
+ if (rpdrv->remove)
+ rpdrv->remove(rpdev);

dev_pm_domain_detach(dev, true);

--
2.20.1.97.g81188d93c3-goog

2019-01-07 18:11:11

by Bjorn Andersson

Subject: Re: [PATCH] rpmsg: core: Make remove handler for rpmsg driver optional.

On Mon 07 Jan 03:38 PST 2019, Pi-Hsun Shih wrote:

> Most other bus (for example, SPI, i2c) have the remove handler for
> driver optional. Make remove handler for rpmsg driver optional too.
>
> Signed-off-by: Pi-Hsun Shih <[email protected]>

Thanks Pi-Hsun, applied.

Regards,
Bjorn

> ---
> drivers/rpmsg/rpmsg_core.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/rpmsg/rpmsg_core.c b/drivers/rpmsg/rpmsg_core.c
> index 8122807db38094..ea88fd4e2a6ecf 100644
> --- a/drivers/rpmsg/rpmsg_core.c
> +++ b/drivers/rpmsg/rpmsg_core.c
> @@ -493,7 +493,8 @@ static int rpmsg_dev_remove(struct device *dev)
> if (rpdev->ops->announce_destroy)
> err = rpdev->ops->announce_destroy(rpdev);
>
> - rpdrv->remove(rpdev);
> + if (rpdrv->remove)
> + rpdrv->remove(rpdev);
>
> dev_pm_domain_detach(dev, true);
>
> --
> 2.20.1.97.g81188d93c3-goog
>