2022-09-14 01:59:43

by CGEL

Subject: [PATCH linux-next] soundwire: intel: Remove unused parameter ret

From: Jinpeng Cui <[email protected]>

The parameter ret = 0 has not been used.
Return 0 directly instead of returning ret.

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: Jinpeng Cui <[email protected]>
---
drivers/soundwire/intel.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index b006ae6efcb0..26fdf3577454 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -395,7 +395,6 @@ static int intel_shim_init(struct sdw_intel *sdw, bool clock_stop)
{
void __iomem *shim = sdw->link_res->shim;
unsigned int link_id = sdw->instance;
- int ret = 0;
u16 ioctl = 0, act = 0;

mutex_lock(sdw->link_res->shim_lock);
@@ -427,7 +426,7 @@ static int intel_shim_init(struct sdw_intel *sdw, bool clock_stop)

mutex_unlock(sdw->link_res->shim_lock);

- return ret;
+ return 0;
}

static void intel_shim_wake(struct sdw_intel *sdw, bool wake_enable)
--
2.25.1

2022-09-14 08:24:42

by Pierre-Louis Bossart

Subject: Re: [PATCH linux-next] soundwire: intel: Remove unused parameter ret

On 9/14/22 03:52, [email protected] wrote:
> From: Jinpeng Cui <[email protected]>
>
> The parameter ret = 0 has not been used.
> Return 0 directly instead of returning ret.

That code will be modified by a cleanup series that is going to land
upstream shortly, see https://github.com/thesofproject/linux/pull/3835

It's not an incorrect change but it will introduce unnecessary churn IMHO.

>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Jinpeng Cui <[email protected]>
> ---
> drivers/soundwire/intel.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
> index b006ae6efcb0..26fdf3577454 100644
> --- a/drivers/soundwire/intel.c
> +++ b/drivers/soundwire/intel.c
> @@ -395,7 +395,6 @@ static int intel_shim_init(struct sdw_intel *sdw, bool clock_stop)
> {
> void __iomem *shim = sdw->link_res->shim;
> unsigned int link_id = sdw->instance;
> - int ret = 0;
> u16 ioctl = 0, act = 0;
>
> mutex_lock(sdw->link_res->shim_lock);
> @@ -427,7 +426,7 @@ static int intel_shim_init(struct sdw_intel *sdw, bool clock_stop)
>
> mutex_unlock(sdw->link_res->shim_lock);
>
> - return ret;
> + return 0;
> }
>
> static void intel_shim_wake(struct sdw_intel *sdw, bool wake_enable)