From: Paul Cercueil <paul@crapouillou.net>
To: Bartosz Golaszewski <brgl@bgdev.pl>,
Aaro Koskinen <aaro.koskinen@iki.fi>,
Janusz Krzysztofik <jmkrzyszt@gmail.com>,
Tony Lindgren <tony@atomide.com>,
Russell King <linux@armlinux.org.uk>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Linus Walleij <linus.walleij@linaro.org>,
Dipen Patel <dipenp@nvidia.com>,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Hans de Goede <hdegoede@redhat.com>,
Mark Gross <markgross@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org,
linux-acpi@vger.kernel.org, timestamp@lists.linux.dev,
linux-tegra@vger.kernel.org,
platform-driver-x86@vger.kernel.org,
Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Subject: Re: [PATCH 19/21] gpio: swnode: replace gpiochip_find() with gpio_device_find_by_label()
Date: Wed, 24 Jan 2024 15:59:22 +0100 [thread overview]
Message-ID: <83ad61e2f9d62621f42d8738f6028103fe8bfb94.camel@crapouillou.net> (raw)
In-Reply-To: <20230905185309.131295-20-brgl@bgdev.pl>
Hi Bartosz,
Le mardi 05 septembre 2023 à 20:53 +0200, Bartosz Golaszewski a écrit :
> From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
>
> We're porting all users of gpiochip_find() to using
> gpio_device_find().
> Update the swnode GPIO code.
>
> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> ---
> drivers/gpio/gpiolib-swnode.c | 29 ++++++++++++-----------------
> 1 file changed, 12 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpio/gpiolib-swnode.c b/drivers/gpio/gpiolib-
> swnode.c
> index b5a6eaf3729b..56c8519be538 100644
> --- a/drivers/gpio/gpiolib-swnode.c
> +++ b/drivers/gpio/gpiolib-swnode.c
> @@ -31,31 +31,26 @@ static void swnode_format_propname(const char
> *con_id, char *propname,
> strscpy(propname, "gpios", max_size);
> }
>
> -static int swnode_gpiochip_match_name(struct gpio_chip *chip, void
> *data)
> +static struct gpio_device *swnode_get_gpio_device(struct
> fwnode_handle *fwnode)
> {
> - return !strcmp(chip->label, data);
> -}
> + const struct software_node *gdev_node;
> + struct gpio_device *gdev;
>
> -static struct gpio_chip *swnode_get_chip(struct fwnode_handle
> *fwnode)
> -{
> - const struct software_node *chip_node;
> - struct gpio_chip *chip;
> -
> - chip_node = to_software_node(fwnode);
> - if (!chip_node || !chip_node->name)
> + gdev_node = to_software_node(fwnode);
> + if (!gdev_node || !gdev_node->name)
> return ERR_PTR(-EINVAL);
>
> - chip = gpiochip_find((void *)chip_node->name,
> swnode_gpiochip_match_name);
> - return chip ?: ERR_PTR(-EPROBE_DEFER);
> + gdev = gpio_device_find_by_label((void *)gdev_node->name);
> + return gdev ?: ERR_PTR(-EPROBE_DEFER);
> }
>
> struct gpio_desc *swnode_find_gpio(struct fwnode_handle *fwnode,
> const char *con_id, unsigned int
> idx,
> unsigned long *flags)
> {
> + struct gpio_device *gdev __free(gpio_device_put) = NULL;
> const struct software_node *swnode;
> struct fwnode_reference_args args;
> - struct gpio_chip *chip;
> struct gpio_desc *desc;
> char propname[32]; /* 32 is max size of property name */
> int error;
> @@ -77,12 +72,12 @@ struct gpio_desc *swnode_find_gpio(struct
> fwnode_handle *fwnode,
> return ERR_PTR(error);
> }
>
> - chip = swnode_get_chip(args.fwnode);
> + gdev = swnode_get_gpio_device(args.fwnode);
> fwnode_handle_put(args.fwnode);
> - if (IS_ERR(chip))
> - return ERR_CAST(chip);
> + if (IS_ERR(gdev))
> + return ERR_CAST(gdev);
I'm a bit late to the party, sorry.
I'm looking at how __free() should be used to use it in my own
patchset, and I was wondering if this code actually works.
What happens if swnode_get_gpio_device() returns an error pointer?
Won't that cause a call to gpio_device_put() with the invalid pointer?
Cheers,
-Paul
>
> - desc = gpiochip_get_desc(chip, args.args[0]);
> + desc = gpiochip_get_desc(gdev->chip, args.args[0]);
> *flags = args.args[1]; /* We expect native GPIO flags */
>
> pr_debug("%s: parsed '%s' property of node '%pfwP[%d]' -
> status (%d)\n",
next prev parent reply other threads:[~2024-01-24 14:59 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-05 18:52 [PATCH 00/21] gpio: convert users to gpio_device_find() and remove gpiochip_find() Bartosz Golaszewski
2023-09-05 18:52 ` [PATCH 01/21] gpiolib: make gpio_device_get() and gpio_device_put() public Bartosz Golaszewski
2023-09-07 7:02 ` Linus Walleij
2023-09-05 18:52 ` [PATCH 02/21] gpiolib: provide gpio_device_find() Bartosz Golaszewski
2023-09-06 14:10 ` Andy Shevchenko
2023-09-11 13:14 ` Bartosz Golaszewski
2023-09-07 7:05 ` Linus Walleij
2023-09-05 18:52 ` [PATCH 03/21] gpiolib: provide gpio_device_find_by_label() Bartosz Golaszewski
2023-09-06 14:13 ` Andy Shevchenko
2023-09-07 7:06 ` Linus Walleij
2023-09-05 18:52 ` [PATCH 04/21] gpiolib: provide gpio_device_get_desc() Bartosz Golaszewski
2023-09-06 14:15 ` Andy Shevchenko
2023-09-07 7:07 ` Linus Walleij
2023-09-05 18:52 ` [PATCH 05/21] gpiolib: add support for scope-based management to gpio_device Bartosz Golaszewski
2023-09-07 7:09 ` Linus Walleij
2023-09-05 18:52 ` [PATCH 06/21] gpiolib: provide gpiod_to_device() Bartosz Golaszewski
2023-09-06 14:17 ` Andy Shevchenko
2023-09-07 7:10 ` Linus Walleij
2023-09-05 18:52 ` [PATCH 07/21] gpiolib: provide gpio_device_get_base() Bartosz Golaszewski
2023-09-07 7:17 ` Linus Walleij
2023-09-07 7:57 ` Bartosz Golaszewski
2023-10-03 20:32 ` Dipen Patel
2023-09-05 18:52 ` [PATCH 08/21] gpio: acpi: provide acpi_gpio_device_free_interrupts() Bartosz Golaszewski
2023-09-06 7:10 ` Mika Westerberg
2023-09-05 18:52 ` [PATCH 09/21] gpiolib: reluctantly provide gpio_device_get_chip() Bartosz Golaszewski
2023-09-07 7:19 ` Linus Walleij
2023-09-05 18:52 ` [PATCH 10/21] gpiolib: replace find_chip_by_name() with gpio_device_find_by_label() Bartosz Golaszewski
2023-09-06 14:23 ` Andy Shevchenko
2023-09-07 7:20 ` Linus Walleij
2023-09-05 18:52 ` [RFT PATCH 11/21] platform: x86: android-tablets: don't access GPIOLIB private members Bartosz Golaszewski
2023-09-06 13:01 ` Hans de Goede
2023-09-06 14:27 ` Bartosz Golaszewski
2023-09-09 14:17 ` Hans de Goede
2023-09-11 10:05 ` Andy Shevchenko
2023-09-05 18:53 ` [PATCH 12/21] hte: allow building modules with COMPILE_TEST enabled Bartosz Golaszewski
2023-09-07 7:22 ` Linus Walleij
2023-09-07 7:31 ` Bartosz Golaszewski
2023-09-05 18:53 ` [PATCH 13/21] hte: tegra194: improve the GPIO-related comment Bartosz Golaszewski
2023-09-07 7:24 ` Linus Walleij
2023-09-05 18:53 ` [RFT PATCH 14/21] hte: tegra194: don't access struct gpio_chip Bartosz Golaszewski
2023-09-06 14:47 ` Andy Shevchenko
2023-09-07 7:28 ` Linus Walleij
2023-10-04 12:00 ` Bartosz Golaszewski
2023-10-04 20:30 ` Dipen Patel
2023-10-04 20:33 ` Dipen Patel
2023-10-04 22:54 ` Dipen Patel
2023-10-04 23:51 ` Dipen Patel
2023-10-05 13:48 ` Bartosz Golaszewski
2023-10-05 18:12 ` Dipen Patel
2023-10-05 19:05 ` Bartosz Golaszewski
2023-10-05 19:43 ` Dipen Patel
2023-10-05 19:47 ` Bartosz Golaszewski
2023-10-09 6:48 ` Bartosz Golaszewski
2023-10-09 16:34 ` Dipen Patel
2023-10-09 17:46 ` Dipen Patel
2023-09-05 18:53 ` [RFT PATCH 15/21] arm: omap1: ams-delta: stop using gpiochip_find() Bartosz Golaszewski
2023-09-06 14:48 ` Andy Shevchenko
2023-09-06 14:56 ` Bartosz Golaszewski
2023-09-07 7:31 ` Linus Walleij
2023-09-08 18:07 ` Janusz Krzysztofik
2023-09-11 11:09 ` Bartosz Golaszewski
2023-09-11 12:50 ` Tony Lindgren
2023-09-11 17:17 ` Janusz Krzysztofik
2023-09-07 7:35 ` Linus Walleij
2023-09-07 7:57 ` Bartosz Golaszewski
2023-10-04 11:59 ` Bartosz Golaszewski
2023-09-05 18:53 ` [PATCH 16/21] gpio: of: correct notifier return codes Bartosz Golaszewski
2023-09-07 7:36 ` Linus Walleij
2023-09-05 18:53 ` [PATCH 17/21] gpio: of: replace gpiochip_find_* with gpio_device_find_* Bartosz Golaszewski
2023-09-07 7:37 ` Linus Walleij
2023-09-07 7:38 ` Linus Walleij
2023-09-05 18:53 ` [PATCH 18/21] gpio: acpi: replace gpiochip_find() with gpio_device_find() Bartosz Golaszewski
2023-09-06 14:50 ` Andy Shevchenko
2023-09-07 7:39 ` Linus Walleij
2023-09-05 18:53 ` [PATCH 19/21] gpio: swnode: replace gpiochip_find() with gpio_device_find_by_label() Bartosz Golaszewski
2023-09-06 14:52 ` Andy Shevchenko
2023-09-07 7:40 ` Linus Walleij
2024-01-24 14:59 ` Paul Cercueil [this message]
2024-01-24 15:04 ` Bartosz Golaszewski
2024-01-24 15:11 ` Paul Cercueil
2024-01-24 15:18 ` Paul Cercueil
2023-09-05 18:53 ` [PATCH 20/21] gpio: sysfs: drop the mention of gpiochip_find() from sysfs code Bartosz Golaszewski
2023-09-07 7:40 ` Linus Walleij
2023-09-05 18:53 ` [PATCH 21/21] gpiolib: remove gpiochip_find() Bartosz Golaszewski
2023-09-06 14:53 ` Andy Shevchenko
2023-09-07 7:42 ` Linus Walleij
2023-09-07 7:00 ` [PATCH 00/21] gpio: convert users to gpio_device_find() and " 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=83ad61e2f9d62621f42d8738f6028103fe8bfb94.camel@crapouillou.net \
--to=paul@crapouillou.net \
--cc=aaro.koskinen@iki.fi \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bartosz.golaszewski@linaro.org \
--cc=brgl@bgdev.pl \
--cc=dipenp@nvidia.com \
--cc=hdegoede@redhat.com \
--cc=jmkrzyszt@gmail.com \
--cc=jonathanh@nvidia.com \
--cc=linus.walleij@linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=markgross@kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=thierry.reding@gmail.com \
--cc=timestamp@lists.linux.dev \
--cc=tony@atomide.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 read-only IMAP folder(s) and NNTP newsgroup(s).