git.openwrt.org Git - openwrt/openwrt.git/blob

   1 From bcd5f0da57e6c47a884dcad94ad6b0e32cce8705 Mon Sep 17 00:00:00 2001
   2 From: Jonas Jelonek <jelonek.jonas@gmail.com>
   3 Date: Sat, 27 Sep 2025 10:19:29 +0000
   4 Subject: [PATCH] i2c: rtl9300: use scoped guard instead of explicit
   5  lock/unlock
   6
   7 Use the scoped guard infrastructure which unlocks a mutex automatically
   8 when the guard goes out of scope, instead of explicit lock and unlock.
   9 This simplifies the code and control flow in rtl9300_i2c_smbus_xfer and
  10 removes the need of using goto in error cases to unlock before
  11 returning.
  12
  13 Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
  14 Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
  15 Tested-by: Chris Packham <chris.packham@alliedtelesis.co.nz> # On RTL9302C based board
  16 Tested-by: Markus Stockhausen <markus.stockhausen@gmx.de>
  17 Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
  18 Link: https://lore.kernel.org/r/20250927101931.71575-8-jelonek.jonas@gmail.com
  19
  20 diff --git a/drivers/i2c/busses/i2c-rtl9300.c b/drivers/i2c/busses/i2c-rtl9300.c
  21 index fb3ebbd46a18..c67463228604 100644
  22 --- a/drivers/i2c/busses/i2c-rtl9300.c
  23 +++ b/drivers/i2c/busses/i2c-rtl9300.c
  24 @@ -72,6 +72,8 @@ struct rtl9300_i2c {
  25         struct mutex lock;
  26  };
  27
  28 +DEFINE_GUARD(rtl9300_i2c, struct rtl9300_i2c *, mutex_lock(&_T->lock), mutex_unlock(&_T->lock))
  29 +
  30  enum rtl9300_i2c_xfer_type {
  31         RTL9300_I2C_XFER_BYTE,
  32         RTL9300_I2C_XFER_WORD,
  33 @@ -283,11 +285,11 @@ static int rtl9300_i2c_smbus_xfer(struct i2c_adapter *adap, u16 addr, unsigned s
  34         if (addr > 0x7f)
  35                 return -EINVAL;
  36
  37 -       mutex_lock(&i2c->lock);
  38 +       guard(rtl9300_i2c)(i2c);
  39
  40         ret = rtl9300_i2c_config_chan(i2c, chan);
  41         if (ret)
  42 -               goto out_unlock;
  43 +               return ret;
  44
  45         xfer.dev_addr = addr & 0x7f;
  46         xfer.write = (read_write == I2C_SMBUS_WRITE);
  47 @@ -324,20 +326,14 @@ static int rtl9300_i2c_smbus_xfer(struct i2c_adapter *adap, u16 addr, unsigned s
  48                 break;
  49         default:
  50                 dev_err(&adap->dev, "Unsupported transaction %d\n", size);
  51 -               ret = -EOPNOTSUPP;
  52 -               goto out_unlock;
  53 +               return -EOPNOTSUPP;
  54         }
  55
  56         ret = rtl9300_i2c_prepare_xfer(i2c, &xfer);
  57         if (ret)
  58 -               goto out_unlock;
  59 -
  60 -       ret = rtl9300_i2c_do_xfer(i2c, &xfer);
  61 -
  62 -out_unlock:
  63 -       mutex_unlock(&i2c->lock);
  64 +               return ret;
  65
  66 -       return ret;
  67 +       return rtl9300_i2c_do_xfer(i2c, &xfer);
  68  }
  69
  70  static u32 rtl9300_i2c_func(struct i2c_adapter *a)
  71 --
  72 2.48.1
  73