]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
i2c: isch: Unify the name of the variable to hold an error code
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 16 Sep 2024 12:01:35 +0000 (15:01 +0300)
committerAndi Shyti <andi.shyti@kernel.org>
Wed, 13 Nov 2024 22:29:46 +0000 (23:29 +0100)
There are two different names used for the variable that holds
an error code. Unify to use one variant in all cases.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
drivers/i2c/busses/i2c-isch.c

index e6b99913f4f3d1bf9775d1c5c9fbd85859d4c5f4..d71a42fd9dd93cb892b538cc707c1850e8140635 100644 (file)
@@ -79,7 +79,7 @@ static int sch_transaction(struct i2c_adapter *adap)
 {
        struct sch_i2c *priv = container_of(adap, struct sch_i2c, adapter);
        int temp;
-       int result = 0;
+       int rc;
 
        dev_dbg(&adap->dev,
                "Transaction (pre): CNT=%02x, CMD=%02x, ADD=%02x, DAT0=%02x, DAT1=%02x\n",
@@ -108,17 +108,16 @@ static int sch_transaction(struct i2c_adapter *adap)
        temp |= 0x10;
        sch_io_wr8(priv, SMBHSTCNT, temp);
 
-       result = read_poll_timeout(sch_io_rd8, temp, !(temp & 0x08), 200, 500000, true,
-                                  priv, SMBHSTSTS);
+       rc = read_poll_timeout(sch_io_rd8, temp, !(temp & 0x08), 200, 500000, true, priv, SMBHSTSTS);
        /* If the SMBus is still busy, we give up */
-       if (result) {
+       if (rc) {
                dev_err(&adap->dev, "SMBus Timeout!\n");
        } else if (temp & 0x04) {
-               result = -EIO;
+               rc = -EIO;
                dev_dbg(&adap->dev, "Bus collision! SMBus may be locked until next hard reset. (sorry!)\n");
                /* Clock stops and target is stuck in mid-transmission */
        } else if (temp & 0x02) {
-               result = -EIO;
+               rc = -EIO;
                dev_err(&adap->dev, "Error: no response!\n");
        } else if (temp & 0x01) {
                dev_dbg(&adap->dev, "Post complete!\n");
@@ -130,14 +129,14 @@ static int sch_transaction(struct i2c_adapter *adap)
                                "Failed reset at end of transaction (%02x), Bus error!\n", temp);
                }
        } else {
-               result = -ENXIO;
+               rc = -ENXIO;
                dev_dbg(&adap->dev, "No such address.\n");
        }
        dev_dbg(&adap->dev, "Transaction (post): CNT=%02x, CMD=%02x, ADD=%02x, DAT0=%02x, DAT1=%02x\n",
                sch_io_rd8(priv, SMBHSTCNT), sch_io_rd8(priv, SMBHSTCMD),
                sch_io_rd8(priv, SMBHSTADD),
                sch_io_rd8(priv, SMBHSTDAT0), sch_io_rd8(priv, SMBHSTDAT1));
-       return result;
+       return rc;
 }
 
 /*