lkml.org 
[lkml]   [2016]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v3 06/10] i2c: i801: do not report an error if FEATURE_HOST_NOTIFY is not set
Date
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 v3

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 55fa6e1..422cce2 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));

@@ -1638,7 +1639,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);
@@ -1693,7 +1694,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.7.4
\
 
 \ /
  Last update: 2016-09-28 10:17    [W:0.083 / U:0.264 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site