Skip to content

Commit

Permalink
i2c: i801: Call i801_check_pre() from i801_access()
Browse files Browse the repository at this point in the history
This avoids code duplication, in a next step we'll call
i801_check_post() from i801_transaction() as well.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
  • Loading branch information
Heiner Kallweit authored and Wolfram Sang committed Feb 17, 2023
1 parent a3989dc commit 1f760b8
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions drivers/i2c/busses/i2c-i801.c
Original file line number Diff line number Diff line change
Expand Up @@ -462,10 +462,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,
Expand Down Expand Up @@ -653,10 +649,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) {
Expand Down Expand Up @@ -891,6 +883,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;
Expand All @@ -913,6 +909,7 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr,
*/
if (hwpec)
outb_p(inb_p(SMBAUXCTL(priv)) & ~SMBAUXCTL_CRC, SMBAUXCTL(priv));
out:
/*
* Unlock the SMBus device for use by BIOS/ACPI,
* and clear status flags if not done already.
Expand Down

0 comments on commit 1f760b8

Please sign in to comment.