Hi Guennadi,
On 22-04-20, 17:11, Guennadi Liakhovetski wrote:
> No need for an "else" after a "return" statement. Remove multiple such
> occurrences.
lgtm, can you please split the patches, one for core sdw (bus.c) and one
for intel parts please
Thanks
>
> Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@xxxxxxxxxxxxxxx>
> ---
> drivers/soundwire/bus.c | 17 ++++++++++-------
> drivers/soundwire/cadence_master.c | 8 ++++++--
> drivers/soundwire/intel_init.c | 4 +++-
> 3 files changed, 19 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c
> index 488c3c9..32de017 100644
> --- a/drivers/soundwire/bus.c
> +++ b/drivers/soundwire/bus.c
> @@ -284,9 +284,10 @@ int sdw_fill_msg(struct sdw_msg *msg, struct sdw_slave *slave,
> msg->flags = flags;
> msg->buf = buf;
>
> - if (addr < SDW_REG_NO_PAGE) { /* no paging area */
> + if (addr < SDW_REG_NO_PAGE) /* no paging area */
> return 0;
> - } else if (addr >= SDW_REG_MAX) { /* illegal addr */
> +
> + if (addr >= SDW_REG_MAX) { /* illegal addr */
> pr_err("SDW: Invalid address %x passed\n", addr);
> return -EINVAL;
> }
> @@ -306,7 +307,9 @@ int sdw_fill_msg(struct sdw_msg *msg, struct sdw_slave *slave,
> if (!slave) {
> pr_err("SDW: No slave for paging addr\n");
> return -EINVAL;
> - } else if (!slave->prop.paging_support) {
> + }
> +
> + if (!slave->prop.paging_support) {
> dev_err(&slave->dev,
> "address %x needs paging but no support\n", addr);
> return -EINVAL;
> @@ -375,8 +378,8 @@ static int sdw_write_no_pm(struct sdw_slave *slave, u32 addr, u8 value)
> ret = sdw_transfer(bus, &msg);
> if (ret < 0)
> return ret;
> - else
> - return buf;
> +
> + return buf;
> }
>
> static int
> @@ -471,8 +474,8 @@ int sdw_read(struct sdw_slave *slave, u32 addr)
> ret = sdw_nread(slave, addr, 1, &buf);
> if (ret < 0)
> return ret;
> - else
> - return buf;
> +
> + return buf;
> }
> EXPORT_SYMBOL(sdw_read);
>
> diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c
> index ecd357d1..9ea8753 100644
> --- a/drivers/soundwire/cadence_master.c
> +++ b/drivers/soundwire/cadence_master.c
> @@ -407,7 +407,9 @@ void sdw_cdns_debugfs_init(struct sdw_cdns *cdns, struct dentry *root)
> if (nack) {
> dev_err_ratelimited(cdns->dev, "Msg NACKed for Slave %d\n", msg->dev_num);
> return SDW_CMD_FAIL;
> - } else if (no_ack) {
> + }
> +
> + if (no_ack) {
> dev_dbg_ratelimited(cdns->dev, "Msg ignored for Slave %d\n", msg->dev_num);
> return SDW_CMD_IGNORED;
> }
> @@ -520,7 +522,9 @@ void sdw_cdns_debugfs_init(struct sdw_cdns *cdns, struct dentry *root)
> dev_err_ratelimited(cdns->dev,
> "SCP_addrpage NACKed for Slave %d\n", msg->dev_num);
> return SDW_CMD_FAIL;
> - } else if (no_ack) {
> + }
> +
> + if (no_ack) {
> dev_dbg_ratelimited(cdns->dev,
> "SCP_addrpage ignored for Slave %d\n", msg->dev_num);
> return SDW_CMD_IGNORED;
> diff --git a/drivers/soundwire/intel_init.c b/drivers/soundwire/intel_init.c
> index 4b76940..d5d4279 100644
> --- a/drivers/soundwire/intel_init.c
> +++ b/drivers/soundwire/intel_init.c
> @@ -86,7 +86,9 @@ static int sdw_intel_cleanup_pdev(struct sdw_intel_ctx *ctx)
> dev_err(&adev->dev, "Link count %d exceeds max %d\n",
> count, SDW_MAX_LINKS);
> return NULL;
> - } else if (!count) {
> + }
> +
> + if (!count) {
> dev_warn(&adev->dev, "No SoundWire links detected\n");
> return NULL;
> }
> --
> 1.9.3
--
~Vinod
