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

i2c: i801: make FEATURE_HOST_NOTIFY dependent on FEATURE_IRQ 



Host notification uses an interrupt, therefore it makes sense only if
interrupts are enabled. Make this dependency explicit by removing
FEATURE_HOST_NOTIFY if FEATURE_IRQ isn't set.

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

drivers/i2c/busses/i2c-i801.c

+9 −5
Original line number Diff line number Diff line
@@ -1705,11 +1705,6 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id) 
		outb_p(inb_p(SMBAUXCTL(priv)) &

		       ~(SMBAUXCTL_CRC | SMBAUXCTL_E32B), SMBAUXCTL(priv));



	/* Remember original Interrupt and Host Notify settings */

	priv->original_hstcnt = inb_p(SMBHSTCNT(priv)) & ~SMBHSTCNT_KILL;

	if (priv->features & FEATURE_HOST_NOTIFY)

		priv->original_slvcmd = inb_p(SMBSLVCMD(priv));



	/* Default timeout in interrupt mode: 200 ms */

	priv->adapter.timeout = HZ / 5;
@@ -1739,6 +1734,15 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	dev_info(&dev->dev, "SMBus using %s\n",

		 priv->features & FEATURE_IRQ ? "PCI interrupt" : "polling");



	/* Host notification uses an interrupt */

	if (!(priv->features & FEATURE_IRQ))

		priv->features &= ~FEATURE_HOST_NOTIFY;



	/* Remember original Interrupt and Host Notify settings */

	priv->original_hstcnt = inb_p(SMBHSTCNT(priv)) & ~SMBHSTCNT_KILL;

	if (priv->features & FEATURE_HOST_NOTIFY)

		priv->original_slvcmd = inb_p(SMBSLVCMD(priv));



	i801_add_tco(priv);



	snprintf(priv->adapter.name, sizeof(priv->adapter.name),