| Message ID | 261bddb8-1a1e-13e9-8557-e4ad1c7f9826@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | i2c: i801: Series with minor improvements | expand |
Hi Heiner, On Fri, 15 Apr 2022 18:58:40 +0200, Heiner Kallweit wrote: > This avoids code duplication, in a next step we'll call > i801_check_post() from i801_access() as well. > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > --- > drivers/i2c/busses/i2c-i801.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c > index 8c2245f38..9061333f2 100644 > --- a/drivers/i2c/busses/i2c-i801.c > +++ b/drivers/i2c/busses/i2c-i801.c > @@ -460,10 +460,6 @@ static int i801_transaction(struct i801_priv *priv, int xact) > unsigned long result; > const struct i2c_adapter *adap = &priv->adapter; > > - status = i801_check_pre(priv); > - if (status < 0) > - return status; > - > if (priv->features & FEATURE_IRQ) { > reinit_completion(&priv->done); > outb_p(xact | SMBHSTCNT_INTREN | SMBHSTCNT_START, > @@ -647,10 +643,6 @@ static int i801_block_transaction_byte_by_byte(struct i801_priv *priv, > if (command == I2C_SMBUS_BLOCK_PROC_CALL) > return -EOPNOTSUPP; > > - status = i801_check_pre(priv); > - if (status < 0) > - return status; > - > len = data->block[0]; > > if (read_write == I2C_SMBUS_WRITE) { > @@ -851,6 +843,10 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr, > > pm_runtime_get_sync(&priv->pci_dev->dev); > > + ret = i801_check_pre(priv); > + if (ret) > + goto out; > + > hwpec = (priv->features & FEATURE_SMBUS_PEC) && (flags & I2C_CLIENT_PEC) > && size != I2C_SMBUS_QUICK > && size != I2C_SMBUS_I2C_BLOCK_DATA; Makes sense, thanks for the clean-up. Reviewed-by: Jean Delvare <jdelvare@suse.de>
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index 8c2245f38..9061333f2 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c @@ -460,10 +460,6 @@ static int i801_transaction(struct i801_priv *priv, int xact) unsigned long result; const struct i2c_adapter *adap = &priv->adapter; - status = i801_check_pre(priv); - if (status < 0) - return status; - if (priv->features & FEATURE_IRQ) { reinit_completion(&priv->done); outb_p(xact | SMBHSTCNT_INTREN | SMBHSTCNT_START, @@ -647,10 +643,6 @@ static int i801_block_transaction_byte_by_byte(struct i801_priv *priv, if (command == I2C_SMBUS_BLOCK_PROC_CALL) return -EOPNOTSUPP; - status = i801_check_pre(priv); - if (status < 0) - return status; - len = data->block[0]; if (read_write == I2C_SMBUS_WRITE) { @@ -851,6 +843,10 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr, pm_runtime_get_sync(&priv->pci_dev->dev); + ret = i801_check_pre(priv); + if (ret) + goto out; + hwpec = (priv->features & FEATURE_SMBUS_PEC) && (flags & I2C_CLIENT_PEC) && size != I2C_SMBUS_QUICK && size != I2C_SMBUS_I2C_BLOCK_DATA;
This avoids code duplication, in a next step we'll call i801_check_post() from i801_access() as well. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- drivers/i2c/busses/i2c-i801.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)