From: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com> To: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>, Matti Vaittinen <mazziesaccount@gmail.com> Cc: "Linus Walleij" <linus.walleij@linaro.org>, "Bartosz Golaszewski" <bgolaszewski@baylibre.com>, "Matti Vaittinen" <matti.vaittinen@fi.rohmeurope.com>, "Michael Walle" <michael@walle.cc>, "Florian Fainelli" <f.fainelli@gmail.com>, bcm-kernel-feedback-list@broadcom.com, "Jonas Gorski" <jonas.gorski@gmail.com>, "Álvaro Fernández Rojas" <noltari@gmail.com>, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-power@fi.rohmeurope.com, linux-arm-kernel@lists.infradead.org, "Andy Shevchenko" <andy.shevchenko@gmail.com> Subject: [PATCH v4 2/3] gpio: gpio-regmap: Use devm_add_action_or_reset() Date: Wed, 26 May 2021 09:10:24 +0300 [thread overview] Message-ID: <cf34b0268bf298314392b0ed8831a4d9cd14efca.1622008846.git.matti.vaittinen@fi.rohmeurope.com> (raw) In-Reply-To: <cover.1622008846.git.matti.vaittinen@fi.rohmeurope.com> [-- Attachment #1: Type: text/plain, Size: 2021 bytes --] Slightly simplify the devm_gpio_regmap_register() by using the devm_add_action_or_reset(). Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com> --- Changelog v3: - gpio-regmap: Use the devm_add_action_or_reset() instead of the devm_add_action() --- drivers/gpio/gpio-regmap.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/drivers/gpio/gpio-regmap.c b/drivers/gpio/gpio-regmap.c index 4f0903d1acd5..ce5bc9e0d684 100644 --- a/drivers/gpio/gpio-regmap.c +++ b/drivers/gpio/gpio-regmap.c @@ -341,9 +341,9 @@ void gpio_regmap_unregister(struct gpio_regmap *gpio) } EXPORT_SYMBOL_GPL(gpio_regmap_unregister); -static void devm_gpio_regmap_unregister(struct device *dev, void *res) +static void devm_gpio_regmap_unregister(void *res) { - gpio_regmap_unregister(*(struct gpio_regmap **)res); + gpio_regmap_unregister(res); } /** @@ -361,20 +361,17 @@ struct gpio_regmap *devm_gpio_regmap_register(struct device *dev, const struct gpio_regmap_config *config, const struct gpio_regmap_ops *ops) { - struct gpio_regmap **ptr, *gpio; - - ptr = devres_alloc(devm_gpio_regmap_unregister, sizeof(*ptr), - GFP_KERNEL); - if (!ptr) - return ERR_PTR(-ENOMEM); + struct gpio_regmap *gpio; + int ret; gpio = gpio_regmap_register(config, ops); - if (!IS_ERR(gpio)) { - *ptr = gpio; - devres_add(dev, ptr); - } else { - devres_free(ptr); - } + + if (IS_ERR(gpio)) + return gpio; + + ret = devm_add_action_or_reset(dev, devm_gpio_regmap_unregister, gpio); + if (ret) + return ERR_PTR(ret); return gpio; } -- 2.25.4 -- Matti Vaittinen, Linux device drivers ROHM Semiconductors, Finland SWDC Kiviharjunlenkki 1E 90220 OULU FINLAND ~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~ Simon says - in Latin please. ~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~ Thanks to Simon Glass for the translation =] [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com> To: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>, Matti Vaittinen <mazziesaccount@gmail.com> Cc: "Linus Walleij" <linus.walleij@linaro.org>, "Bartosz Golaszewski" <bgolaszewski@baylibre.com>, "Matti Vaittinen" <matti.vaittinen@fi.rohmeurope.com>, "Michael Walle" <michael@walle.cc>, "Florian Fainelli" <f.fainelli@gmail.com>, bcm-kernel-feedback-list@broadcom.com, "Jonas Gorski" <jonas.gorski@gmail.com>, "Álvaro Fernández Rojas" <noltari@gmail.com>, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-power@fi.rohmeurope.com, linux-arm-kernel@lists.infradead.org, "Andy Shevchenko" <andy.shevchenko@gmail.com> Subject: [PATCH v4 2/3] gpio: gpio-regmap: Use devm_add_action_or_reset() Date: Wed, 26 May 2021 09:10:24 +0300 [thread overview] Message-ID: <cf34b0268bf298314392b0ed8831a4d9cd14efca.1622008846.git.matti.vaittinen@fi.rohmeurope.com> (raw) In-Reply-To: <cover.1622008846.git.matti.vaittinen@fi.rohmeurope.com> [-- Attachment #1.1: Type: text/plain, Size: 2021 bytes --] Slightly simplify the devm_gpio_regmap_register() by using the devm_add_action_or_reset(). Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com> --- Changelog v3: - gpio-regmap: Use the devm_add_action_or_reset() instead of the devm_add_action() --- drivers/gpio/gpio-regmap.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/drivers/gpio/gpio-regmap.c b/drivers/gpio/gpio-regmap.c index 4f0903d1acd5..ce5bc9e0d684 100644 --- a/drivers/gpio/gpio-regmap.c +++ b/drivers/gpio/gpio-regmap.c @@ -341,9 +341,9 @@ void gpio_regmap_unregister(struct gpio_regmap *gpio) } EXPORT_SYMBOL_GPL(gpio_regmap_unregister); -static void devm_gpio_regmap_unregister(struct device *dev, void *res) +static void devm_gpio_regmap_unregister(void *res) { - gpio_regmap_unregister(*(struct gpio_regmap **)res); + gpio_regmap_unregister(res); } /** @@ -361,20 +361,17 @@ struct gpio_regmap *devm_gpio_regmap_register(struct device *dev, const struct gpio_regmap_config *config, const struct gpio_regmap_ops *ops) { - struct gpio_regmap **ptr, *gpio; - - ptr = devres_alloc(devm_gpio_regmap_unregister, sizeof(*ptr), - GFP_KERNEL); - if (!ptr) - return ERR_PTR(-ENOMEM); + struct gpio_regmap *gpio; + int ret; gpio = gpio_regmap_register(config, ops); - if (!IS_ERR(gpio)) { - *ptr = gpio; - devres_add(dev, ptr); - } else { - devres_free(ptr); - } + + if (IS_ERR(gpio)) + return gpio; + + ret = devm_add_action_or_reset(dev, devm_gpio_regmap_unregister, gpio); + if (ret) + return ERR_PTR(ret); return gpio; } -- 2.25.4 -- Matti Vaittinen, Linux device drivers ROHM Semiconductors, Finland SWDC Kiviharjunlenkki 1E 90220 OULU FINLAND ~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~ Simon says - in Latin please. ~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~ Thanks to Simon Glass for the translation =] [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 176 bytes --] _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-05-26 6:10 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-26 6:02 [PATCH v4 0/3] gpio: gpio-regmap: Support few custom operations Matti Vaittinen 2021-05-26 6:02 ` Matti Vaittinen 2021-05-26 6:10 ` [PATCH v4 1/3] gpio: regmap: Support few IC specific operations Matti Vaittinen 2021-05-26 6:10 ` Matti Vaittinen 2021-05-26 6:10 ` Matti Vaittinen [this message] 2021-05-26 6:10 ` [PATCH v4 2/3] gpio: gpio-regmap: Use devm_add_action_or_reset() Matti Vaittinen 2021-05-28 17:17 ` Michael Walle 2021-05-28 17:17 ` Michael Walle 2021-06-02 11:54 ` Bartosz Golaszewski 2021-06-02 11:54 ` Bartosz Golaszewski 2021-06-03 4:26 ` Matti Vaittinen 2021-06-03 4:26 ` Matti Vaittinen 2021-06-03 7:40 ` Michael Walle 2021-06-03 7:40 ` Michael Walle 2021-05-26 6:10 ` [PATCH v4 3/3] gpio: bd71815: Use gpio-regmap Matti Vaittinen 2021-05-26 6:10 ` Matti Vaittinen 2021-05-26 8:42 ` [PATCH v4 0/3] gpio: gpio-regmap: Support few custom operations Andy Shevchenko 2021-05-26 8:42 ` Andy Shevchenko 2021-05-26 9:07 ` Michael Walle 2021-05-26 9:07 ` Michael Walle 2021-05-26 9:44 ` Matti Vaittinen 2021-05-26 9:44 ` Matti Vaittinen 2021-05-26 10:27 ` Michael Walle 2021-05-26 10:27 ` Michael Walle 2021-05-26 11:00 ` Matti Vaittinen 2021-05-26 11:00 ` Matti Vaittinen 2021-05-26 22:46 ` Linus Walleij 2021-05-26 22:46 ` Linus Walleij 2021-05-27 6:32 ` Matti Vaittinen 2021-05-27 6:32 ` Matti Vaittinen 2021-05-28 0:53 ` Linus Walleij 2021-05-28 0:53 ` Linus Walleij 2021-05-28 6:33 ` Vaittinen, Matti 2021-05-28 6:33 ` Vaittinen, Matti 2021-05-28 14:31 ` Bartosz Golaszewski 2021-05-28 14:31 ` Bartosz Golaszewski 2021-05-28 15:42 ` Vaittinen, Matti 2021-05-28 15:42 ` Vaittinen, Matti 2021-05-28 17:23 ` Michael Walle 2021-05-28 17:23 ` Michael Walle 2021-05-31 7:42 ` Vaittinen, Matti 2021-05-31 7:42 ` Vaittinen, Matti
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=cf34b0268bf298314392b0ed8831a4d9cd14efca.1622008846.git.matti.vaittinen@fi.rohmeurope.com \ --to=matti.vaittinen@fi.rohmeurope.com \ --cc=andy.shevchenko@gmail.com \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=bgolaszewski@baylibre.com \ --cc=f.fainelli@gmail.com \ --cc=jonas.gorski@gmail.com \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-power@fi.rohmeurope.com \ --cc=mazziesaccount@gmail.com \ --cc=michael@walle.cc \ --cc=noltari@gmail.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.