Commit c601610c authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Wolfram Sang
Browse files

i2c: i801: Improve i801_setup_hstcfg 



i801_setup_hstcfg() leaves the bits in priv->original_hstcfg that
we're interested in intact. Therefore we can remove the return value
from the function and use priv->original_hstcfg directly.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarJean Delvare <jdelvare@suse.de>
Tested-by: default avatarJean Delvare <jdelvare@suse.de>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent d4a994f6

drivers/i2c/busses/i2c-i801.c

+4 −6
Original line number Diff line number Diff line
@@ -1684,19 +1684,17 @@ static inline int i801_acpi_probe(struct i801_priv *priv) { return 0; } 
static inline void i801_acpi_remove(struct i801_priv *priv) { }

#endif



static unsigned char i801_setup_hstcfg(struct i801_priv *priv)

static void i801_setup_hstcfg(struct i801_priv *priv)

{

	unsigned char hstcfg = priv->original_hstcfg;



	hstcfg &= ~SMBHSTCFG_I2C_EN;	/* SMBus timing */

	hstcfg |= SMBHSTCFG_HST_EN;

	pci_write_config_byte(priv->pci_dev, SMBHSTCFG, hstcfg);

	return hstcfg;

}



static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)

{

	unsigned char temp;

	int err, i;

	struct i801_priv *priv;
@@ -1818,16 +1816,16 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	}



	pci_read_config_byte(priv->pci_dev, SMBHSTCFG, &priv->original_hstcfg);

	temp = i801_setup_hstcfg(priv);

	i801_setup_hstcfg(priv);

	if (!(priv->original_hstcfg & SMBHSTCFG_HST_EN))

		dev_info(&dev->dev, "Enabling SMBus device\n");



	if (temp & SMBHSTCFG_SMB_SMI_EN) {

	if (priv->original_hstcfg & SMBHSTCFG_SMB_SMI_EN) {

		dev_dbg(&dev->dev, "SMBus using interrupt SMI#\n");

		/* Disable SMBus interrupt feature if SMBus using SMI# */

		priv->features &= ~FEATURE_IRQ;

	}

	if (temp & SMBHSTCFG_SPD_WD)

	if (priv->original_hstcfg & SMBHSTCFG_SPD_WD)

		dev_info(&dev->dev, "SPD Write Disable is set\n");



	/* Clear special mode bits */