* [PATCH 2/2] soundwire: cadence: Simplify error paths in cdns_xfer_msg()
2022-09-17 15:48 [PATCH 1/2] soundwire: cadence: Fix error check in cdns_xfer_msg() Richard Fitzgerald
@ 2022-09-17 15:48 ` Richard Fitzgerald
2022-09-19 8:48 ` Pierre-Louis Bossart
2022-09-19 8:48 ` [PATCH 1/2] soundwire: cadence: Fix error check " Pierre-Louis Bossart
2022-09-20 5:07 ` Vinod Koul
2 siblings, 1 reply; 5+ messages in thread
From: Richard Fitzgerald @ 2022-09-17 15:48 UTC (permalink / raw)
To: vkoul, yung-chuan.liao, pierre-louis.bossart, sanyog.r.kale
Cc: alsa-devel, linux-kernel, patches, Richard Fitzgerald
There's no need to goto an exit label to return from cdns_xfer_msg().
It doesn't do any cleanup, only a return statement.
Replace the gotos with returns.
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
---
drivers/soundwire/cadence_master.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c
index 3543a923ee6b..30b8c628fdbd 100644
--- a/drivers/soundwire/cadence_master.c
+++ b/drivers/soundwire/cadence_master.c
@@ -709,17 +709,14 @@ cdns_xfer_msg(struct sdw_bus *bus, struct sdw_msg *msg)
ret = _cdns_xfer_msg(cdns, msg, cmd, i * CDNS_MCP_CMD_LEN,
CDNS_MCP_CMD_LEN, false);
if (ret != SDW_CMD_OK)
- goto exit;
+ return ret;
}
if (!(msg->len % CDNS_MCP_CMD_LEN))
- goto exit;
+ return SDW_CMD_OK;
- ret = _cdns_xfer_msg(cdns, msg, cmd, i * CDNS_MCP_CMD_LEN,
- msg->len % CDNS_MCP_CMD_LEN, false);
-
-exit:
- return ret;
+ return _cdns_xfer_msg(cdns, msg, cmd, i * CDNS_MCP_CMD_LEN,
+ msg->len % CDNS_MCP_CMD_LEN, false);
}
EXPORT_SYMBOL(cdns_xfer_msg);
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] soundwire: cadence: Simplify error paths in cdns_xfer_msg()
2022-09-17 15:48 ` [PATCH 2/2] soundwire: cadence: Simplify error paths " Richard Fitzgerald
@ 2022-09-19 8:48 ` Pierre-Louis Bossart
0 siblings, 0 replies; 5+ messages in thread
From: Pierre-Louis Bossart @ 2022-09-19 8:48 UTC (permalink / raw)
To: Richard Fitzgerald, vkoul, yung-chuan.liao, sanyog.r.kale
Cc: alsa-devel, linux-kernel, patches
On 9/17/22 17:48, Richard Fitzgerald wrote:
> There's no need to goto an exit label to return from cdns_xfer_msg().
> It doesn't do any cleanup, only a return statement.
>
> Replace the gotos with returns.
>
> Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> ---
> drivers/soundwire/cadence_master.c | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c
> index 3543a923ee6b..30b8c628fdbd 100644
> --- a/drivers/soundwire/cadence_master.c
> +++ b/drivers/soundwire/cadence_master.c
> @@ -709,17 +709,14 @@ cdns_xfer_msg(struct sdw_bus *bus, struct sdw_msg *msg)
> ret = _cdns_xfer_msg(cdns, msg, cmd, i * CDNS_MCP_CMD_LEN,
> CDNS_MCP_CMD_LEN, false);
> if (ret != SDW_CMD_OK)
> - goto exit;
> + return ret;
> }
>
> if (!(msg->len % CDNS_MCP_CMD_LEN))
> - goto exit;
> + return SDW_CMD_OK;
>
> - ret = _cdns_xfer_msg(cdns, msg, cmd, i * CDNS_MCP_CMD_LEN,
> - msg->len % CDNS_MCP_CMD_LEN, false);
> -
> -exit:
> - return ret;
> + return _cdns_xfer_msg(cdns, msg, cmd, i * CDNS_MCP_CMD_LEN,
> + msg->len % CDNS_MCP_CMD_LEN, false);
> }
> EXPORT_SYMBOL(cdns_xfer_msg);
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] soundwire: cadence: Fix error check in cdns_xfer_msg()
2022-09-17 15:48 [PATCH 1/2] soundwire: cadence: Fix error check in cdns_xfer_msg() Richard Fitzgerald
2022-09-17 15:48 ` [PATCH 2/2] soundwire: cadence: Simplify error paths " Richard Fitzgerald
@ 2022-09-19 8:48 ` Pierre-Louis Bossart
2022-09-20 5:07 ` Vinod Koul
2 siblings, 0 replies; 5+ messages in thread
From: Pierre-Louis Bossart @ 2022-09-19 8:48 UTC (permalink / raw)
To: Richard Fitzgerald, vkoul, yung-chuan.liao, sanyog.r.kale
Cc: patches, alsa-devel, linux-kernel
On 9/17/22 17:48, Richard Fitzgerald wrote:
> _cdns_xfer_msg() returns an sdw_command_response value, not a
> negative error code.
>
> Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
we've got other issues like this such as
enum sdw_command_response
cdns_xfer_msg_defer(struct sdw_bus *bus,
struct sdw_msg *msg, struct sdw_defer *defer)
{
struct sdw_cdns *cdns = bus_to_cdns(bus);
int cmd = 0, ret;
/* for defer only 1 message is supported */
if (msg->len > 1)
return -ENOTSUPP; <<< that's not right
We should probably double-check that all functions return enums don't
return negative values.
> ---
> drivers/soundwire/cadence_master.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c
> index ca241bbeadd9..3543a923ee6b 100644
> --- a/drivers/soundwire/cadence_master.c
> +++ b/drivers/soundwire/cadence_master.c
> @@ -708,7 +708,7 @@ cdns_xfer_msg(struct sdw_bus *bus, struct sdw_msg *msg)
> for (i = 0; i < msg->len / CDNS_MCP_CMD_LEN; i++) {
> ret = _cdns_xfer_msg(cdns, msg, cmd, i * CDNS_MCP_CMD_LEN,
> CDNS_MCP_CMD_LEN, false);
> - if (ret < 0)
> + if (ret != SDW_CMD_OK)
> goto exit;
> }
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] soundwire: cadence: Fix error check in cdns_xfer_msg()
2022-09-17 15:48 [PATCH 1/2] soundwire: cadence: Fix error check in cdns_xfer_msg() Richard Fitzgerald
2022-09-17 15:48 ` [PATCH 2/2] soundwire: cadence: Simplify error paths " Richard Fitzgerald
2022-09-19 8:48 ` [PATCH 1/2] soundwire: cadence: Fix error check " Pierre-Louis Bossart
@ 2022-09-20 5:07 ` Vinod Koul
2 siblings, 0 replies; 5+ messages in thread
From: Vinod Koul @ 2022-09-20 5:07 UTC (permalink / raw)
To: Richard Fitzgerald
Cc: yung-chuan.liao, pierre-louis.bossart, sanyog.r.kale, alsa-devel,
linux-kernel, patches
On 17-09-22, 16:48, Richard Fitzgerald wrote:
> _cdns_xfer_msg() returns an sdw_command_response value, not a
> negative error code.
Applied, thanks
--
~Vinod
^ permalink raw reply [flat|nested] 5+ messages in thread