Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-17 02:15:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

i2c: i801: Add helper i801_get_block_len

Browse Source 
Avoid code duplication and factor out retrieving and checking the
block length value to new helper i801_get_block_len().

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
This commit is contained in:
Heiner Kallweit 2024-02-02 08:06:30 +01:00 committed by Andi Shyti
parent 29dae4572e
commit 857cc04cdf
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/i2c/busses/i2c-i801.c
View File

@ -330,6 +330,18 @@ MODULE_PARM_DESC(disable_features, "Disable selected driver features:\n"
"\t\t 0x10 don't use interrupts\n" "\t\t 0x10 don't use interrupts\n"
"\t\t 0x20 disable SMBus Host Notify "); "\t\t 0x20 disable SMBus Host Notify ");
static int i801_get_block_len(struct i801_priv *priv)
{
u8 len = inb_p(SMBHSTDAT0(priv));
if (len < 1 || len > I2C_SMBUS_BLOCK_MAX) {
pci_err(priv->pci_dev, "Illegal SMBus block read size %u\n", len);
return -EPROTO;
}
return len;
}
static int i801_check_and_clear_pec_error(struct i801_priv *priv) static int i801_check_and_clear_pec_error(struct i801_priv *priv)
{ {
u8 status; u8 status;
@ -525,12 +537,11 @@ static int i801_block_transaction_by_block(struct i801_priv *priv,
if (read_write == I2C_SMBUS_READ || if (read_write == I2C_SMBUS_READ ||
command == I2C_SMBUS_BLOCK_PROC_CALL) { command == I2C_SMBUS_BLOCK_PROC_CALL) {
len = inb_p(SMBHSTDAT0(priv)); status = i801_get_block_len(priv);
if (len < 1 || len > I2C_SMBUS_BLOCK_MAX) { if (status < 0)
status = -EPROTO;
goto out; goto out;
}
len = status;
data->block[0] = len; data->block[0] = len;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
data->block[i + 1] = inb_p(SMBBLKDAT(priv)); data->block[i + 1] = inb_p(SMBBLKDAT(priv));
@ -549,14 +560,11 @@ static void i801_isr_byte_done(struct i801_priv *priv)
* and read the block length from SMBHSTDAT0. * and read the block length from SMBHSTDAT0.
*/ */
if (priv->len == SMBUS_LEN_SENTINEL) { if (priv->len == SMBUS_LEN_SENTINEL) {
priv->len = inb_p(SMBHSTDAT0(priv)); priv->len = i801_get_block_len(priv);
if (priv->len < 1 || priv->len > I2C_SMBUS_BLOCK_MAX) { if (priv->len < 0)
dev_err(&priv->pci_dev->dev,
"Illegal SMBus block read size %d\n",
priv->len);
/* FIXME: Recover */ /* FIXME: Recover */
priv->len = I2C_SMBUS_BLOCK_MAX; priv->len = I2C_SMBUS_BLOCK_MAX;
}
priv->data[-1] = priv->len; priv->data[-1] = priv->len;
} }
@ -709,11 +717,8 @@ static int i801_block_transaction_byte_by_byte(struct i801_priv *priv,
* and read the block length from SMBHSTDAT0. * and read the block length from SMBHSTDAT0.
*/ */
if (len == SMBUS_LEN_SENTINEL) { if (len == SMBUS_LEN_SENTINEL) {
len = inb_p(SMBHSTDAT0(priv)); len = i801_get_block_len(priv);
if (len < 1 || len > I2C_SMBUS_BLOCK_MAX) { if (len < 0) {
dev_err(&priv->pci_dev->dev,
"Illegal SMBus block read size %d\n",
len);
/* Recover */ /* Recover */
while (inb_p(SMBHSTSTS(priv)) & while (inb_p(SMBHSTSTS(priv)) &
SMBHSTSTS_HOST_BUSY) SMBHSTSTS_HOST_BUSY)