2023-01-06 15:55:01

by Dawei Li

Subject: [PATCH v2] soc: qcom: apr: make remove callback of apr driver void returned

Since commit fc7a6209d571 ("bus: Make remove callback return void")
forces bus_type::remove be void-returned, it doesn't make much sense
for any bus based driver implementing remove callbalk to return
non-void to its caller.

As such, change the remove function for apr bus based drivers to
return void.

Signed-off-by: Dawei Li <[email protected]>
---
v1 -> v2
- Update commit message.

v1
- https://lore.kernel.org/all/TYCP286MB2323DBD1F01BF918ADD0ABCECA189@TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM/
---
include/linux/soc/qcom/apr.h | 2 +-
sound/soc/qcom/qdsp6/q6core.c | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/linux/soc/qcom/apr.h b/include/linux/soc/qcom/apr.h
index 23c5b30f3511..be98aebcb3e1 100644
--- a/include/linux/soc/qcom/apr.h
+++ b/include/linux/soc/qcom/apr.h
@@ -153,7 +153,7 @@ typedef struct apr_device gpr_device_t;

struct apr_driver {
int (*probe)(struct apr_device *sl);
- int (*remove)(struct apr_device *sl);
+ void (*remove)(struct apr_device *sl);
int (*callback)(struct apr_device *a,
struct apr_resp_pkt *d);
int (*gpr_callback)(struct gpr_resp_pkt *d, void *data, int op);
diff --git a/sound/soc/qcom/qdsp6/q6core.c b/sound/soc/qcom/qdsp6/q6core.c
index 5358fefd4210..49cfb32cd209 100644
--- a/sound/soc/qcom/qdsp6/q6core.c
+++ b/sound/soc/qcom/qdsp6/q6core.c
@@ -339,7 +339,7 @@ static int q6core_probe(struct apr_device *adev)
return 0;
}

-static int q6core_exit(struct apr_device *adev)
+static void q6core_exit(struct apr_device *adev)
{
struct q6core *core = dev_get_drvdata(&adev->dev);

@@ -350,8 +350,6 @@ static int q6core_exit(struct apr_device *adev)

g_core = NULL;
kfree(core);
-
- return 0;
}

#ifdef CONFIG_OF
--
2.25.1

2023-01-06 20:48:05

by Bjorn Andersson

Subject: Re: [PATCH v2] soc: qcom: apr: make remove callback of apr driver void returned

On Fri, 6 Jan 2023 23:28:03 +0800, Dawei Li wrote:
> Since commit fc7a6209d571 ("bus: Make remove callback return void")
> forces bus_type::remove be void-returned, it doesn't make much sense
> for any bus based driver implementing remove callbalk to return
> non-void to its caller.
>
> As such, change the remove function for apr bus based drivers to
> return void.
>
> [...]

Applied, thanks!

[1/1] soc: qcom: apr: make remove callback of apr driver void returned
commit: 33ae3d0955943ac5bacfcb6911cf7cb74822bf8c

Best regards,
--
Bjorn Andersson <[email protected]>