i2c: i801: Improve i801_setup_hstcfg
PATCH 1/1 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 Heiner Kallweit <[email protected]>
--- drivers/i2c/busses/i2c-i801.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/i2c/busses/i2c-i801.c +4 -6
@@ -1692,19 +1692,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;
@@ -1827,16 +1825,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 */
Signature · 1 line
2.31.1
Quoted 9 lines · Heiner Kallweit
i801_setup_hstcfg()leaves the bits inpriv->original_hstcfgthat we're interested in intact. Therefore we can remove the return value from the function and usepriv->original_hstcfgdirectly.Signed-off-by Heiner Kallweit <[email protected]>--- drivers/i2c/busses/i2c-i801.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)(...)
I like it.
Reviewed-by Jean Delvare <[email protected]>
Tested-by Jean Delvare <[email protected]>
Signature · 2 lines
Jean Delvare SUSE L3 Support
Wolfram Sang
AppliedQuoted 5 lines · Heiner Kallweit
i801_setup_hstcfg()leaves the bits inpriv->original_hstcfgthat we're interested in intact. Therefore we can remove the return value from the function and usepriv->original_hstcfgdirectly.Signed-off-by Heiner Kallweit <[email protected]>
Applied to for-next, thanks!