From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Mika Westerberg <mika.westerberg@linux.intel.com>,
Linus Walleij <linus.walleij@linaro.org>,
linux-gpio@vger.kernel.org, linux-acpi@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: Re: [PATCH v1 1/4] gpiolib: Unify the checks on fwnode type
Date: Tue, 2 Mar 2021 17:48:35 +0200 [thread overview]
Message-ID: <YD5eU8LrMnq2dlUU@smile.fi.intel.com> (raw)
In-Reply-To: <20210302153451.50593-1-andriy.shevchenko@linux.intel.com>
On Tue, Mar 02, 2021 at 05:34:48PM +0200, Andy Shevchenko wrote:
> We have (historically) different approaches how we identify the type
> of a given fwnode. Let's standardize them across the library code.
This patch has one functional mistake (see below), otherwise I will anyway wait
for people to comment on the series.
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> drivers/gpio/gpiolib.c | 28 +++++++++++++---------------
> 1 file changed, 13 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
> index adf55db080d8..484ac92903ab 100644
> --- a/drivers/gpio/gpiolib.c
> +++ b/drivers/gpio/gpiolib.c
> @@ -3678,11 +3678,12 @@ EXPORT_SYMBOL_GPL(fwnode_gpiod_get_index);
> */
> int gpiod_count(struct device *dev, const char *con_id)
> {
> + const struct fwnode_handle *fwnode = dev_fwnode(dev);
It should be
const struct fwnode_handle *fwnode = dev ? dev_fwnode(dev) : NULL;
> int count = -ENOENT;
>
> - if (IS_ENABLED(CONFIG_OF) && dev && dev->of_node)
> + if (is_of_node(fwnode))
> count = of_gpio_get_count(dev, con_id);
> - else if (IS_ENABLED(CONFIG_ACPI) && dev && ACPI_HANDLE(dev))
> + else if (is_acpi_node(fwnode))
> count = acpi_gpio_count(dev, con_id);
>
> if (count < 0)
> @@ -3820,18 +3821,17 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev,
> int ret;
> /* Maybe we have a device name, maybe not */
> const char *devname = dev ? dev_name(dev) : "?";
> + const struct fwnode_handle *fwnode = dev ? dev_fwnode(dev) : NULL;
>
> dev_dbg(dev, "GPIO lookup for consumer %s\n", con_id);
>
> - if (dev) {
> - /* Using device tree? */
> - if (IS_ENABLED(CONFIG_OF) && dev->of_node) {
> - dev_dbg(dev, "using device tree for GPIO lookup\n");
> - desc = of_find_gpio(dev, con_id, idx, &lookupflags);
> - } else if (ACPI_COMPANION(dev)) {
> - dev_dbg(dev, "using ACPI for GPIO lookup\n");
> - desc = acpi_find_gpio(dev, con_id, idx, &flags, &lookupflags);
> - }
> + /* Using device tree? */
> + if (is_of_node(fwnode)) {
> + dev_dbg(dev, "using device tree for GPIO lookup\n");
> + desc = of_find_gpio(dev, con_id, idx, &lookupflags);
> + } else if (is_acpi_node(fwnode)) {
> + dev_dbg(dev, "using ACPI for GPIO lookup\n");
> + desc = acpi_find_gpio(dev, con_id, idx, &flags, &lookupflags);
> }
>
> /*
> @@ -3915,9 +3915,6 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
> struct gpio_desc *desc = ERR_PTR(-ENODEV);
> int ret;
>
> - if (!fwnode)
> - return ERR_PTR(-EINVAL);
> -
> if (is_of_node(fwnode)) {
> desc = gpiod_get_from_of_node(to_of_node(fwnode),
> propname, index,
> @@ -3933,7 +3930,8 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
>
> acpi_gpio_update_gpiod_flags(&dflags, &info);
> acpi_gpio_update_gpiod_lookup_flags(&lflags, &info);
> - }
> + } else
> + return ERR_PTR(-EINVAL);
>
> /* Currently only ACPI takes this path */
> ret = gpiod_request(desc, label);
> --
> 2.30.1
>
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2021-03-02 19:49 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-02 15:34 [PATCH v1 1/4] gpiolib: Unify the checks on fwnode type Andy Shevchenko
2021-03-02 15:34 ` [PATCH v1 2/4] gpiolib: Move of_node operations to gpiolib-of and correct fwnode use Andy Shevchenko
2021-03-03 9:15 ` Linus Walleij
2021-03-02 15:34 ` [PATCH v1 3/4] gpiolib: Introduce acpi_gpio_dev_init() and call it from core Andy Shevchenko
2021-03-03 9:16 ` Linus Walleij
2021-03-02 15:34 ` [PATCH v1 4/4] gpiolib: Reuse device's fwnode to create IRQ domain Andy Shevchenko
2021-03-03 9:22 ` Linus Walleij
2021-03-03 9:35 ` Andy Shevchenko
2021-03-04 8:06 ` Linus Walleij
2021-03-04 12:23 ` Andy Shevchenko
2021-03-04 13:41 ` Rafael J. Wysocki
2021-03-04 15:40 ` Andy Shevchenko
2021-03-04 15:54 ` Rafael J. Wysocki
2021-03-02 15:48 ` Andy Shevchenko [this message]
2021-03-03 9:11 ` [PATCH v1 1/4] gpiolib: Unify the checks on fwnode type Linus Walleij
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=YD5eU8LrMnq2dlUU@smile.fi.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=bgolaszewski@baylibre.com \
--cc=linus.walleij@linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.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).