From: Wolfram Sang <wsa+renesas@sang-engineering.com>
To: linux-i2c@vger.kernel.org
Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Wolfram Sang <wsa@the-dreams.de>,
linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 08/12] i2c: i2c-core-acpi: convert to use i2c_new_client_device()
Date: Tue, 7 Jan 2020 18:47:42 +0100 [thread overview]
Message-ID: <20200107174748.9616-9-wsa+renesas@sang-engineering.com> (raw)
In-Reply-To: <20200107174748.9616-1-wsa+renesas@sang-engineering.com>
Move away from the deprecated API and return the shiny new ERRPTR where
useful.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
Build tested only.
drivers/i2c/i2c-core-acpi.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index 62a1c92ab803..8f3dbc97a057 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -225,7 +225,7 @@ static void i2c_acpi_register_device(struct i2c_adapter *adapter,
adev->power.flags.ignore_parent = true;
acpi_device_set_enumerated(adev);
- if (!i2c_new_device(adapter, info)) {
+ if (IS_ERR(i2c_new_client_device(adapter, info))) {
adev->power.flags.ignore_parent = false;
dev_err(&adapter->dev,
"failed to add I2C device %s from ACPI\n",
@@ -451,7 +451,8 @@ struct notifier_block i2c_acpi_notifier = {
* resources, in that case this function can be used to create an i2c-client
* for other I2cSerialBus resources in the Current Resource Settings table.
*
- * Also see i2c_new_device, which this function calls to create the i2c-client.
+ * Also see i2c_new_client_device, which this function calls to create the
+ * i2c-client.
*
* Returns a pointer to the new i2c-client, or error pointer in case of failure.
* Specifically, -EPROBE_DEFER is returned if the adapter is not found.
@@ -461,7 +462,6 @@ struct i2c_client *i2c_acpi_new_device(struct device *dev, int index,
{
struct i2c_acpi_lookup lookup;
struct i2c_adapter *adapter;
- struct i2c_client *client;
struct acpi_device *adev;
LIST_HEAD(resource_list);
int ret;
@@ -489,11 +489,7 @@ struct i2c_client *i2c_acpi_new_device(struct device *dev, int index,
if (!adapter)
return ERR_PTR(-EPROBE_DEFER);
- client = i2c_new_device(adapter, info);
- if (!client)
- return ERR_PTR(-ENODEV);
-
- return client;
+ return i2c_new_client_device(adapter, info);
}
EXPORT_SYMBOL_GPL(i2c_acpi_new_device);
--
2.20.1
next prev parent reply other threads:[~2020-01-07 17:48 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 17:47 [PATCH 00/12] i2c: convert subsystem to use i2c_new_client_device() Wolfram Sang
2020-01-07 17:47 ` [PATCH 01/12] i2c: cht-wc: convert " Wolfram Sang
2020-01-09 23:05 ` Hans de Goede
2020-01-07 17:47 ` [PATCH 02/12] i2c: i801: " Wolfram Sang
2020-01-09 8:54 ` Jean Delvare
2020-01-07 17:47 ` [PATCH 03/12] i2c: nvidia-gpu: " Wolfram Sang
2020-01-07 17:47 ` [PATCH 04/12] i2c: ocores: " Wolfram Sang
2020-01-07 18:32 ` Peter Korsgaard
2020-01-07 19:31 ` Wolfram Sang
2020-01-07 19:58 ` Peter Korsgaard
2020-01-07 19:36 ` Andrew Lunn
2020-01-07 17:47 ` [PATCH 05/12] i2c: powermac: " Wolfram Sang
2020-01-07 17:47 ` [PATCH 06/12] i2c: taos-evm: " Wolfram Sang
2020-01-08 10:58 ` Jean Delvare
2020-01-09 8:42 ` Jean Delvare
2020-01-15 19:56 ` Wolfram Sang
2020-01-07 17:47 ` [PATCH 07/12] i2c: xiic: " Wolfram Sang
2020-01-08 11:39 ` Michal Simek
2020-01-07 17:47 ` Wolfram Sang [this message]
2020-01-08 10:04 ` [PATCH 08/12] i2c: i2c-core-acpi: " Mika Westerberg
2020-01-07 17:47 ` [PATCH 09/12] i2c: i2c-core-base: " Wolfram Sang
2020-01-07 17:47 ` [PATCH 10/12] i2c: i2c-core-of: " Wolfram Sang
2020-01-07 17:47 ` [PATCH 11/12] docs: i2c: use the new API in 'instantiating-devices.rst' Wolfram Sang
2020-01-07 17:47 ` [PATCH 12/12] docs: i2c: use the new API in 'writing-clients' Wolfram Sang
2020-01-15 19:57 ` [PATCH 00/12] i2c: convert subsystem to use i2c_new_client_device() Wolfram Sang
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=20200107174748.9616-9-wsa+renesas@sang-engineering.com \
--to=wsa+renesas@sang-engineering.com \
--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=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).