From: Vinod Koul <vkoul@kernel.org>
To: alsa-devel@alsa-project.org
Cc: Greg KH <gregkh@linuxfoundation.org>,
Sanyog Kale <sanyog.r.kale@intel.com>,
Vinod Koul <vkoul@kernel.org>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Shreyas NC <shreyas.nc@intel.com>
Subject: [PATCH 10/14] soundwire: avoid multiple assignments
Date: Thu, 2 May 2019 16:29:26 +0530 [thread overview]
Message-ID: <20190502105930.9889-11-vkoul@kernel.org> (raw)
In-Reply-To: <20190502105930.9889-1-vkoul@kernel.org>
Modify the code to avoid multiple assignments by assigning to variable
after error checks in soundwire bus.
CHECK: multiple assignments should be avoided
Signed-off-by: Vinod Koul <vkoul@kernel.org>
---
drivers/soundwire/bus.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c
index 16b2a3b2662d..aac35fc3cf22 100644
--- a/drivers/soundwire/bus.c
+++ b/drivers/soundwire/bus.c
@@ -812,12 +812,13 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)
sdw_modify_slave_status(slave, SDW_SLAVE_ALERT);
/* Read Instat 1, Instat 2 and Instat 3 registers */
- buf = ret = sdw_read(slave, SDW_SCP_INT1);
+ ret = sdw_read(slave, SDW_SCP_INT1);
if (ret < 0) {
dev_err(slave->bus->dev,
"SDW_SCP_INT1 read failed:%d\n", ret);
return ret;
}
+ buf = ret;
ret = sdw_nread(slave, SDW_SCP_INTSTAT2, 2, buf2);
if (ret < 0) {
@@ -910,12 +911,13 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)
* Read status again to ensure no new interrupts arrived
* while servicing interrupts.
*/
- _buf = ret = sdw_read(slave, SDW_SCP_INT1);
+ ret = sdw_read(slave, SDW_SCP_INT1);
if (ret < 0) {
dev_err(slave->bus->dev,
"SDW_SCP_INT1 read failed:%d\n", ret);
return ret;
}
+ _buf = ret;
ret = sdw_nread(slave, SDW_SCP_INTSTAT2, 2, _buf2);
if (ret < 0) {
--
2.20.1
next prev parent reply other threads:[~2019-05-02 11:00 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-02 10:59 [PATCH 00/14] soundwire: more code cleanups Vinod Koul
2019-05-02 10:59 ` [PATCH 01/14] soundwire: fix kconfig help format Vinod Koul
2019-05-02 15:07 ` Greg KH
2019-05-02 15:15 ` Vinod Koul
2019-05-02 15:20 ` Greg KH
2019-05-02 15:15 ` Greg KH
2019-05-02 15:21 ` Vinod Koul
2019-05-02 16:35 ` Greg KH
2019-05-02 10:59 ` [PATCH 02/14] soundwire: fix SPDX license for header files Vinod Koul
2019-05-02 10:59 ` [PATCH 03/14] soundwire: intel: fix SPDX license for header file Vinod Koul
2019-05-02 10:59 ` [PATCH 04/14] soundwire: remove empty line before/after braces Vinod Koul
2019-05-02 10:59 ` [PATCH 05/14] soundwire: cadence: remove empty line after braces Vinod Koul
2019-05-02 10:59 ` [PATCH 06/14] soundwire: intel: " Vinod Koul
2019-05-02 10:59 ` [PATCH 07/14] soundwire: add argument to function definition Vinod Koul
2019-05-02 10:59 ` [PATCH 08/14] soundwire: more alignment fixes Vinod Koul
2019-05-02 10:59 ` [PATCH 09/14] soundwire: intel: " Vinod Koul
2019-05-02 10:59 ` Vinod Koul [this message]
2019-05-02 10:59 ` [PATCH 11/14] soundwire: fix more typos Vinod Koul
2019-05-02 10:59 ` [PATCH 12/14] soundwire: wrap macro argument in parenthesis Vinod Koul
2019-05-02 10:59 ` [PATCH 13/14] soundwire: add a blank line between functions Vinod Koul
2019-05-02 10:59 ` [PATCH 14/14] soundwire: remove multiple blank lines Vinod Koul
2019-05-02 15:10 ` [PATCH 00/14] soundwire: more code cleanups Greg KH
2019-05-02 15:19 ` Greg KH
2019-05-02 15:42 ` Pierre-Louis Bossart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190502105930.9889-11-vkoul@kernel.org \
--to=vkoul@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=gregkh@linuxfoundation.org \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=sanyog.r.kale@intel.com \
--cc=shreyas.nc@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.