From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Darren Hart <dvhart@infradead.org>,
platform-driver-x86@vger.kernel.org,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
linux-acpi@vger.kernel.org, Jonathan Cameron <jic23@kernel.org>,
Wolfram Sang <wsa@the-dreams.de>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
linux-i2c@vger.kernel.org, Hans de Goede <hdegoede@redhat.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
linux-kernel@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 05/13] i2c: acpi: Return error pointers from i2c_acpi_new_device()
Date: Mon, 26 Nov 2018 17:08:50 +0200 [thread overview]
Message-ID: <20181126150858.16901-6-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20181126150858.16901-1-andriy.shevchenko@linux.intel.com>
The caller would like to know the reason why the i2c_acpi_new_device() fails.
For example, if adapter is not available, it might be in the future and we
would like to re-probe the clients again. But at the same time we would like to
bail out if the error seems unrecoverable, such as out of memory condition.
To achieve this, return error pointer in some cases.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
drivers/i2c/i2c-core-acpi.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index 32affd3fa8bd..af4b5bd5d973 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -387,6 +387,7 @@ struct notifier_block i2c_acpi_notifier = {
* Also see i2c_new_device, which this function calls to create the i2c-client.
*
* Returns a pointer to the new i2c-client, or NULL if the adapter is not found.
+ * In some cases might return an error pointer.
*/
struct i2c_client *i2c_acpi_new_device(struct device *dev, int index,
struct i2c_board_info *info)
@@ -399,7 +400,7 @@ struct i2c_client *i2c_acpi_new_device(struct device *dev, int index,
adev = ACPI_COMPANION(dev);
if (!adev)
- return NULL;
+ return ERR_PTR(-ENODEV);
memset(&lookup, 0, sizeof(lookup));
lookup.info = info;
@@ -409,9 +410,11 @@ struct i2c_client *i2c_acpi_new_device(struct device *dev, int index,
ret = acpi_dev_get_resources(adev, &resource_list,
i2c_acpi_fill_info, &lookup);
acpi_dev_free_resource_list(&resource_list);
+ if (ret < 0)
+ return ERR_PTR(ret);
- if (ret < 0 || !info->addr)
- return NULL;
+ if (!info->addr)
+ return ERR_PTR(-EADDRNOTAVAIL);
adapter = i2c_acpi_find_adapter_by_handle(lookup.adapter_handle);
if (!adapter)
--
2.19.1
next prev parent reply other threads:[~2018-11-26 15:08 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-26 15:08 [PATCH v2 00/13] i2c-multi-instantiate: Adapt for INT3515 and alike Andy Shevchenko
2018-11-26 15:08 ` [PATCH v2 01/13] platform/x86: intel_cht_int33fe: Remove duplicate NULL check Andy Shevchenko
2018-11-26 15:08 ` [PATCH v2 02/13] platform/x86: intel_cht_int33fe: Accept errors of i2c_acpi_new_device() Andy Shevchenko
2018-11-26 15:08 ` [PATCH v2 03/13] platform/x86: i2c-multi-instantiate: " Andy Shevchenko
2018-11-26 15:08 ` [PATCH v2 04/13] platform/x86: i2c-mutli-instantiate: Defer probe when no adapter found Andy Shevchenko
2018-11-26 15:08 ` Andy Shevchenko [this message]
2018-11-27 9:04 ` [PATCH v2 05/13] i2c: acpi: Return error pointers from i2c_acpi_new_device() Mika Westerberg
2018-11-27 9:16 ` Hans de Goede
2018-11-27 11:49 ` Mika Westerberg
2018-11-27 13:46 ` Andy Shevchenko
2018-11-27 15:24 ` Hans de Goede
2018-11-27 15:40 ` Andy Shevchenko
2018-11-26 15:08 ` [PATCH v2 06/13] i2c: acpi: Use ACPI_FAILURE instead of !ACPI_SUCCESS Andy Shevchenko
2018-11-27 9:05 ` Mika Westerberg
2018-11-26 15:08 ` [PATCH v2 07/13] i2c: acpi: Introduce i2c_acpi_get_i2c_resource() helper Andy Shevchenko
2018-11-27 9:07 ` Mika Westerberg
2018-11-27 14:27 ` Andy Shevchenko
2018-11-26 15:08 ` [PATCH v2 08/13] platform/x86: i2c-multi-instantiate: Count I2cSerialBus() resources Andy Shevchenko
2018-11-26 15:08 ` [PATCH v2 09/13] platform/x86: i2c-multi-instantiate: Distinguish IRQ resource type Andy Shevchenko
2018-11-26 15:08 ` [PATCH v2 10/13] platform/x86: i2c-multi-instantiate: Introduce IOAPIC IRQ support Andy Shevchenko
2018-11-26 15:08 ` [PATCH v2 11/13] platform/x86: i2c-multi-instantiate: Allow to have same slaves Andy Shevchenko
2018-11-26 15:08 ` [PATCH v2 12/13] ACPI / scan: Create platform device for INT3515 ACPI nodes Andy Shevchenko
2018-11-26 15:08 ` [PATCH v2 13/13] iio: inv_mpu6050: Use i2c_acpi_get_i2c_resource() helper Andy Shevchenko
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=20181126150858.16901-6-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=dvhart@infradead.org \
--cc=hdegoede@redhat.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=jic23@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--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