From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
To: Jean Delvare <jdelvare@suse.com>,
Wolfram Sang <wsa@the-dreams.de>,
linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 4/5] i2c: i801: do not report an error if FEATURE_HOST_NOTIFY is not set
Date: Thu, 28 Jul 2016 11:50:42 +0200 [thread overview]
Message-ID: <1469699443-22129-5-git-send-email-benjamin.tissoires@redhat.com> (raw)
In-Reply-To: <1469699443-22129-1-git-send-email-benjamin.tissoires@redhat.com>
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.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
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 3321956..a9b9bb4 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -943,12 +943,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;
+ }
outb_p(SMBSLVCMD_HST_NTFY_INTREN, SMBSLVCMD(priv));
/* clear Host Notify bit to allow a new notification */
@@ -1635,7 +1636,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);
@@ -1690,7 +1691,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
next prev parent reply other threads:[~2016-07-28 9:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-28 9:50 [PATCH 0/5] i2c: Host Notify / i801 fixes Benjamin Tissoires
2016-07-28 9:50 ` [PATCH 1/5] i2c: i2c-smbus: prevent races on remove when Host Notify is used Benjamin Tissoires
2016-07-29 9:12 ` Jean Delvare
2016-07-29 16:30 ` Benjamin Tissoires
2016-08-01 13:32 ` Jean Delvare
2016-08-19 13:25 ` Benjamin Tissoires
2016-07-28 9:50 ` [PATCH 2/5] i2c: i801: minor formatting issues Benjamin Tissoires
2016-07-29 9:13 ` Jean Delvare
2016-07-28 9:50 ` [PATCH 3/5] i2c: i801: use BIT() macro for bits definition Benjamin Tissoires
2016-07-29 9:35 ` Jean Delvare
2016-07-28 9:50 ` Benjamin Tissoires [this message]
2016-07-29 10:40 ` [PATCH 4/5] i2c: i801: do not report an error if FEATURE_HOST_NOTIFY is not set Jean Delvare
2016-07-28 9:50 ` [PATCH 5/5] i2c: i801: warn on i2c_handle_smbus_host_notify() errors Benjamin Tissoires
2016-08-01 14:14 ` Jean Delvare
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1469699443-22129-5-git-send-email-benjamin.tissoires@redhat.com \
--to=benjamin.tissoires@redhat.com \
--cc=jdelvare@suse.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).