diff mbox series

[v4,03/11] leds: led-class: Add __devm_led_get() helper

Message ID	20230119130053.111344-4-hdegoede@redhat.com (mailing list archive)
State	Superseded
Headers	From: Hans de Goede <hdegoede@redhat.com> To: Mark Gross <markgross@kernel.org>, Andy Shevchenko <andy@kernel.org>, Pavel Machek <pavel@ucw.cz>, Lee Jones <lee@kernel.org>, Linus Walleij <linus.walleij@linaro.org>, Daniel Scally <djrscally@gmail.com>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Mauro Carvalho Chehab <mchehab@kernel.org>, Sakari Ailus <sakari.ailus@linux.intel.com> Cc: Hans de Goede <hdegoede@redhat.com>, platform-driver-x86@vger.kernel.org, linux-leds@vger.kernel.org, linux-gpio@vger.kernel.org, Kate Hsuan <hpa@redhat.com>, Mark Pearson <markpearson@lenovo.com>, Andy Yeh <andy.yeh@intel.com>, Hao Yao <hao.yao@intel.com>, linux-media@vger.kernel.org Subject: [PATCH v4 03/11] leds: led-class: Add __devm_led_get() helper Date: Thu, 19 Jan 2023 14:00:45 +0100 Message-Id: <20230119130053.111344-4-hdegoede@redhat.com> In-Reply-To: <20230119130053.111344-1-hdegoede@redhat.com> References: <20230119130053.111344-1-hdegoede@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	leds: lookup-table support + int3472/media privacy LED support \| [v4,00/11] leds: lookup-table support + int3472/media privacy LED support [v4,01/11] leds: led-class: Add missing put_device() to led_put() [v4,02/11] leds: led-class: Add led_module_get() helper [v4,03/11] leds: led-class: Add __devm_led_get() helper [v4,04/11] leds: led-class: Add generic [devm_]led_get() [v4,05/11,RFC] leds: led-class: Add devicetree support to led_get() [v4,06/11] media: v4l2-core: Built async and fwnode code into videodev.ko [v4,07/11] media: v4l2-core: Make the v4l2-core code enable/disable the privacy LED if present [v4,08/11] platform/x86: int3472/discrete: Refactor GPIO to sensor mapping [v4,09/11] platform/x86: int3472/discrete: Create a LED class device for the privacy LED [v4,10/11] platform/x86: int3472/discrete: Move GPIO request to skl_int3472_register_clock() [v4,11/11] platform/x86: int3472/discrete: Get the polarity from the _DSM entry

Commit Message

Hans de Goede Jan. 19, 2023, 1 p.m. UTC

Add a __devm_led_get() helper which registers a passed in led_classdev
with devm for unregistration.

This is a preparation patch for adding a generic (non devicetree specific)
devm_led_get() function.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/leds/led-class.c | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

Comments

Andy Shevchenko Jan. 19, 2023, 1:25 p.m. UTC | #1

On Thu, Jan 19, 2023 at 3:01 PM Hans de Goede <hdegoede@redhat.com> wrote:
>
> Add a __devm_led_get() helper which registers a passed in led_classdev
> with devm for unregistration.
>
> This is a preparation patch for adding a generic (non devicetree specific)
> devm_led_get() function.

It's just a move of the existing code...
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
...but I would expect that someone converts this to use
devm_add_action_or_reset().

> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
>  drivers/leds/led-class.c | 29 +++++++++++++++++------------
>  1 file changed, 17 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
> index 743d97b082dc..4904d140a560 100644
> --- a/drivers/leds/led-class.c
> +++ b/drivers/leds/led-class.c
> @@ -274,6 +274,22 @@ static void devm_led_release(struct device *dev, void *res)
>         led_put(*p);
>  }
>
> +static struct led_classdev *__devm_led_get(struct device *dev, struct led_classdev *led)
> +{
> +       struct led_classdev **dr;
> +
> +       dr = devres_alloc(devm_led_release, sizeof(struct led_classdev *), GFP_KERNEL);
> +       if (!dr) {
> +               led_put(led);
> +               return ERR_PTR(-ENOMEM);
> +       }
> +
> +       *dr = led;
> +       devres_add(dev, dr);
> +
> +       return led;
> +}
> +
>  /**
>   * devm_of_led_get - Resource-managed request of a LED device
>   * @dev:       LED consumer
> @@ -289,7 +305,6 @@ struct led_classdev *__must_check devm_of_led_get(struct device *dev,
>                                                   int index)
>  {
>         struct led_classdev *led;
> -       struct led_classdev **dr;
>
>         if (!dev)
>                 return ERR_PTR(-EINVAL);
> @@ -298,17 +313,7 @@ struct led_classdev *__must_check devm_of_led_get(struct device *dev,
>         if (IS_ERR(led))
>                 return led;
>
> -       dr = devres_alloc(devm_led_release, sizeof(struct led_classdev *),
> -                         GFP_KERNEL);
> -       if (!dr) {
> -               led_put(led);
> -               return ERR_PTR(-ENOMEM);
> -       }
> -
> -       *dr = led;
> -       devres_add(dev, dr);
> -
> -       return led;
> +       return __devm_led_get(dev, led);
>  }
>  EXPORT_SYMBOL_GPL(devm_of_led_get);
>
> --
> 2.39.0
>

Linus Walleij Jan. 20, 2023, 7:25 a.m. UTC | #2

On Thu, Jan 19, 2023 at 2:01 PM Hans de Goede <hdegoede@redhat.com> wrote:

> Add a __devm_led_get() helper which registers a passed in led_classdev
> with devm for unregistration.
>
> This is a preparation patch for adding a generic (non devicetree specific)
> devm_led_get() function.
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

I'm not a fan of __inner_functions because they are easy to
confuse with the namespace for __compiler_directives
but no big deal so:
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

diff mbox series

Patch

diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index 743d97b082dc..4904d140a560 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -274,6 +274,22 @@  static void devm_led_release(struct device *dev, void *res)
 	led_put(*p);
 }
 
+static struct led_classdev *__devm_led_get(struct device *dev, struct led_classdev *led)
+{
+	struct led_classdev **dr;
+
+	dr = devres_alloc(devm_led_release, sizeof(struct led_classdev *), GFP_KERNEL);
+	if (!dr) {
+		led_put(led);
+		return ERR_PTR(-ENOMEM);
+	}
+
+	*dr = led;
+	devres_add(dev, dr);
+
+	return led;
+}
+
 /**
  * devm_of_led_get - Resource-managed request of a LED device
  * @dev:	LED consumer
@@ -289,7 +305,6 @@  struct led_classdev *__must_check devm_of_led_get(struct device *dev,
 						  int index)
 {
 	struct led_classdev *led;
-	struct led_classdev **dr;
 
 	if (!dev)
 		return ERR_PTR(-EINVAL);
@@ -298,17 +313,7 @@  struct led_classdev *__must_check devm_of_led_get(struct device *dev,
 	if (IS_ERR(led))
 		return led;
 
-	dr = devres_alloc(devm_led_release, sizeof(struct led_classdev *),
-			  GFP_KERNEL);
-	if (!dr) {
-		led_put(led);
-		return ERR_PTR(-ENOMEM);
-	}
-
-	*dr = led;
-	devres_add(dev, dr);
-
-	return led;
+	return __devm_led_get(dev, led);
 }
 EXPORT_SYMBOL_GPL(devm_of_led_get);