From patchwork Thu Jul 28 09:50:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 653658 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3s0RwJ0yfwz9t1w for ; Thu, 28 Jul 2016 19:52:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753974AbcG1JvL (ORCPT ); Thu, 28 Jul 2016 05:51:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59906 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755213AbcG1Ju6 (ORCPT ); Thu, 28 Jul 2016 05:50:58 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2AB85C05678C; Thu, 28 Jul 2016 09:50:58 +0000 (UTC) Received: from plouf.banquise.eu.com (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6S9ojgb032193; Thu, 28 Jul 2016 05:50:56 -0400 From: Benjamin Tissoires To: Jean Delvare , Wolfram Sang , 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 Message-Id: <1469699443-22129-5-git-send-email-benjamin.tissoires@redhat.com> In-Reply-To: <1469699443-22129-1-git-send-email-benjamin.tissoires@redhat.com> References: <1469699443-22129-1-git-send-email-benjamin.tissoires@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 28 Jul 2016 09:50:58 +0000 (UTC) Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org 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 Reviewed-by: Jean Delvare --- 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;