Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1466419
| From | Benjamin Tissoires <benjamin.tissoires@redhat.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 06/10] i2c: i801: do not report an error if FEATURE_HOST_NOTIFY is not set |
| Date | 2016-08-19 15:40 +0200 |
| Message-ID | <s7SbD-6dI-21@gated-at.bofh.it> (permalink) |
| References | <s7S1Y-68X-21@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
we can skip one test when calling i801_enable_host_notify(). Given
that we call it all the time, it's better to consider the fact that
the adapter doesn't support Host Notify as not an error.
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
no changes in v2
---
drivers/i2c/busses/i2c-i801.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index a5360df8..74fb144 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -944,12 +944,13 @@ static int i801_enable_host_notify(struct i2c_adapter *adapter)
struct i801_priv *priv = i2c_get_adapdata(adapter);
if (!(priv->features & FEATURE_HOST_NOTIFY))
- return -ENOTSUPP;
+ return 0; /* not an error actually */
- if (!priv->host_notify)
+ if (!priv->host_notify) {
priv->host_notify = i2c_setup_smbus_host_notify(adapter);
- if (!priv->host_notify)
- return -ENOMEM;
+ if (!priv->host_notify)
+ return -ENOMEM;
+ }
priv->original_slvcmd = inb_p(SMBSLVCMD(priv));
@@ -1639,7 +1640,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
* is not used if i2c_add_adapter() fails.
*/
err = i801_enable_host_notify(&priv->adapter);
- if (err && err != -ENOTSUPP)
+ if (err)
dev_warn(&dev->dev, "Unable to enable SMBus Host Notify\n");
i801_probe_optional_slaves(priv);
@@ -1694,7 +1695,7 @@ static int i801_resume(struct device *dev)
int err;
err = i801_enable_host_notify(&priv->adapter);
- if (err && err != -ENOTSUPP)
+ if (err)
dev_warn(dev, "Unable to enable SMBus Host Notify\n");
return 0;
--
2.5.5
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 00/10] i2c: Host Notify / i801 fixes Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:30 +0200 [PATCH v2 02/10] i2c: i801: store and restore the SLVCMD register at load and unload Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:30 +0200 [PATCH v2 04/10] i2c: i801: use BIT() macro for bits definition Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:40 +0200 [PATCH v2 10/10] i2c: i801: remove SMBNTFDDAT reads as they always seem to return 0 Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:40 +0200 [PATCH v2 06/10] i2c: i801: do not report an error if FEATURE_HOST_NOTIFY is not set Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:40 +0200 [PATCH v2 01/10] i2c: i2c-smbus: prevent races on remove when Host Notify is used Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:40 +0200 [PATCH v2 07/10] i2c: i2c-smbus: remove double warning message Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:40 +0200 [PATCH v2 03/10] i2c: i801: minor formatting issues Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:40 +0200 [PATCH v2 08/10] i2c: i2c-smbus: fix return value of i2c_handle_smbus_host_notify() Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:40 +0200 [PATCH v2 05/10] i2c: i801: use the BIT() macro for FEATURES_* also Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:40 +0200 [PATCH v2 09/10] i2c: i801: warn on i2c_handle_smbus_host_notify() errors Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-08-19 15:40 +0200
csiph-web