From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Wolfram Sang <wsa+renesas@sang-engineering.com>
Cc: linux-i2c <linux-i2c@vger.kernel.org>,
Linux-Renesas <linux-renesas-soc@vger.kernel.org>,
Heiner Kallweit <hkallweit1@gmail.com>,
Kieran Bingham <kieran@ksquared.org.uk>,
Peter Rosin <peda@axentia.se>
Subject: Re: [PATCH v8 1/3] i2c: core: improve return value handling of i2c_new_device and i2c_new_dummy
Date: Fri, 17 May 2019 10:56:34 +0200 [thread overview]
Message-ID: <CAMRc=Mc2x=A_WDni8WzeHS0+4u5v+=Twtu7mhVXqwbhpewb=bg@mail.gmail.com> (raw)
In-Reply-To: <20190516211310.22277-2-wsa+renesas@sang-engineering.com>
czw., 16 maj 2019 o 23:13 Wolfram Sang
<wsa+renesas@sang-engineering.com> napisał(a):
>
> From: Heiner Kallweit <hkallweit1@gmail.com>
>
> Currently i2c_new_device and i2c_new_dummy return just NULL in error
> case although they have more error details internally. Therefore move
> the functionality into new functions returning detailed errors and
> add wrappers for compatibility with the current API.
>
> This allows to use these functions with detailed error codes within
> the i2c core or for API extensions.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> [wsa: rename new functions and fix minor kdoc issues]
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> ---
> drivers/i2c/i2c-core-base.c | 74 ++++++++++++++++++++++++++++++-------
> 1 file changed, 61 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
> index 9732a81bb7dd..9c38dde73366 100644
> --- a/drivers/i2c/i2c-core-base.c
> +++ b/drivers/i2c/i2c-core-base.c
> @@ -714,7 +714,7 @@ static int i2c_dev_irq_from_resources(const struct resource *resources,
> }
>
> /**
> - * i2c_new_device - instantiate an i2c device
> + * i2c_new_client_device - instantiate an i2c device
> * @adap: the adapter managing the device
> * @info: describes one I2C device; bus_num is ignored
> * Context: can sleep
> @@ -727,17 +727,17 @@ static int i2c_dev_irq_from_resources(const struct resource *resources,
> * before any i2c_adapter could exist.
> *
> * This returns the new i2c client, which may be saved for later use with
> - * i2c_unregister_device(); or NULL to indicate an error.
> + * i2c_unregister_device(); or an ERR_PTR to describe the error.
> */
> -struct i2c_client *
> -i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info)
> +static struct i2c_client *
> +i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *info)
> {
> struct i2c_client *client;
> int status;
>
> client = kzalloc(sizeof *client, GFP_KERNEL);
> if (!client)
> - return NULL;
> + return ERR_PTR(-ENOMEM);
>
> client->adapter = adap;
>
> @@ -803,7 +803,31 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info)
> client->name, client->addr, status);
> out_err_silent:
> kfree(client);
> - return NULL;
> + return ERR_PTR(status);
> +}
> +EXPORT_SYMBOL_GPL(i2c_new_client_device);
> +
> +/**
> + * i2c_new_device - instantiate an i2c device
> + * @adap: the adapter managing the device
> + * @info: describes one I2C device; bus_num is ignored
> + * Context: can sleep
> + *
> + * This deprecated function has the same functionality as
> + * @i2c_new_client_device, it just returns NULL instead of an ERR_PTR in case of
> + * an error for compatibility with current I2C API. It will be removed once all
> + * users are converted.
> + *
> + * This returns the new i2c client, which may be saved for later use with
> + * i2c_unregister_device(); or NULL to indicate an error.
> + */
> +struct i2c_client *
> +i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info)
> +{
> + struct i2c_client *ret;
> +
> + ret = i2c_new_client_device(adap, info);
> + return IS_ERR(ret) ? NULL : ret;
> }
> EXPORT_SYMBOL_GPL(i2c_new_device);
>
> @@ -854,7 +878,7 @@ static struct i2c_driver dummy_driver = {
> };
>
> /**
> - * i2c_new_dummy - return a new i2c device bound to a dummy driver
> + * i2c_new_dummy_device - return a new i2c device bound to a dummy driver
> * @adapter: the adapter managing the device
> * @address: seven bit address to be used
> * Context: can sleep
> @@ -869,15 +893,39 @@ static struct i2c_driver dummy_driver = {
> * different driver.
> *
> * This returns the new i2c client, which should be saved for later use with
> - * i2c_unregister_device(); or NULL to indicate an error.
> + * i2c_unregister_device(); or an ERR_PTR to describe the error.
> */
> -struct i2c_client *i2c_new_dummy(struct i2c_adapter *adapter, u16 address)
> +static struct i2c_client *
> +i2c_new_dummy_device(struct i2c_adapter *adapter, u16 address)
> {
> struct i2c_board_info info = {
> I2C_BOARD_INFO("dummy", address),
> };
>
> - return i2c_new_device(adapter, &info);
> + return i2c_new_client_device(adapter, &info);
> +}
> +EXPORT_SYMBOL_GPL(i2c_new_dummy_device);
> +
> +/**
> + * i2c_new_dummy - return a new i2c device bound to a dummy driver
> + * @adapter: the adapter managing the device
> + * @address: seven bit address to be used
> + * Context: can sleep
> + *
> + * This deprecated function has the same functionality as @i2c_new_dummy_device,
> + * it just returns NULL instead of an ERR_PTR in case of an error for
> + * compatibility with current I2C API. It will be removed once all users are
> + * converted.
> + *
> + * This returns the new i2c client, which should be saved for later use with
> + * i2c_unregister_device(); or NULL to indicate an error.
> + */
> +struct i2c_client *i2c_new_dummy(struct i2c_adapter *adapter, u16 address)
> +{
> + struct i2c_client *ret;
> +
> + ret = i2c_new_dummy_device(adapter, address);
> + return IS_ERR(ret) ? NULL : ret;
> }
> EXPORT_SYMBOL_GPL(i2c_new_dummy);
>
> @@ -1000,9 +1048,9 @@ i2c_sysfs_new_device(struct device *dev, struct device_attribute *attr,
> info.flags |= I2C_CLIENT_SLAVE;
> }
>
> - client = i2c_new_device(adap, &info);
> - if (!client)
> - return -EINVAL;
> + client = i2c_new_client_device(adap, &info);
> + if (IS_ERR(client))
> + return PTR_ERR(client);
>
> /* Keep track of the added device */
> mutex_lock(&adap->userspace_clients_lock);
> --
> 2.19.1
>
Reviewed-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
next prev parent reply other threads:[~2019-05-17 8:56 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-16 21:13 [PATCH v8 0/3] i2c: improve i2c_new_{device|dummy} Wolfram Sang
2019-05-16 21:13 ` [PATCH v8 1/3] i2c: core: improve return value handling of i2c_new_device and i2c_new_dummy Wolfram Sang
2019-05-17 7:16 ` Peter Rosin
2019-05-17 17:35 ` Wolfram Sang
2019-05-17 8:02 ` Kieran Bingham
2019-05-17 8:56 ` Bartosz Golaszewski [this message]
2019-05-17 17:35 ` Wolfram Sang
2019-05-16 21:13 ` [PATCH v8 2/3] i2c: core: add device-managed version of i2c_new_dummy Wolfram Sang
2019-05-17 7:17 ` Peter Rosin
2019-05-17 8:21 ` Kieran Bingham
2019-05-17 8:57 ` Bartosz Golaszewski
2019-05-17 17:35 ` Wolfram Sang
2019-05-16 21:13 ` [PATCH v8 3/3] mfd: da9063: occupy second I2C address, too Wolfram Sang
2019-05-17 7:17 ` Peter Rosin
2019-05-17 8:57 ` Bartosz Golaszewski
2019-05-17 14:56 ` Kieran Bingham
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='CAMRc=Mc2x=A_WDni8WzeHS0+4u5v+=Twtu7mhVXqwbhpewb=bg@mail.gmail.com' \
--to=brgl@bgdev.pl \
--cc=hkallweit1@gmail.com \
--cc=kieran@ksquared.org.uk \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=peda@axentia.se \
--cc=wsa+renesas@sang-engineering.com \
/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).