soundwire: avoid multiple assignments
authorVinod Koul <vkoul@kernel.org>
Thu, 2 May 2019 10:59:26 +0000 (16:29 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 2 May 2019 15:17:51 +0000 (17:17 +0200)
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/soundwire/bus.c

index 16b2a3b2662ddf98dd26edb225c01181e9879efb..aac35fc3cf22c46f65deb7cdbdd7674d72efc394 100644 (file)
@@ -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) {