diff mbox series

[v4,02/11] leds: led-class: Add led_module_get() helper

Message ID 20230119130053.111344-3-hdegoede@redhat.com (mailing list archive)
State Superseded
Headers
Series leds: lookup-table support + int3472/media privacy LED support |

Commit Message

Hans de Goede Jan. 19, 2023, 1 p.m. UTC 
Split out part of of_led_get() into a generic led_module_get() helper
function.

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

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
Changes in v4:
- Rename helper from __led_get() to led_module_get()
---
 drivers/leds/led-class.c | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

Comments

Andy Shevchenko Jan. 19, 2023, 1:22 p.m. UTC | #1 
On Thu, Jan 19, 2023 at 3:01 PM Hans de Goede <hdegoede@redhat.com> wrote:
>
> Split out part of of_led_get() into a generic led_module_get() helper
> function.
>
> This is a preparation patch for adding a generic (non devicetree specific)
> led_get() function.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
> Changes in v4:
> - Rename helper from __led_get() to led_module_get()
> ---
>  drivers/leds/led-class.c | 30 ++++++++++++++++++------------
>  1 file changed, 18 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
> index 7391d2cf1370..743d97b082dc 100644
> --- a/drivers/leds/led-class.c
> +++ b/drivers/leds/led-class.c
> @@ -215,6 +215,23 @@ static int led_resume(struct device *dev)
>
>  static SIMPLE_DEV_PM_OPS(leds_class_dev_pm_ops, led_suspend, led_resume);
>
> +static struct led_classdev *led_module_get(struct device *led_dev)
> +{
> +       struct led_classdev *led_cdev;
> +
> +       if (!led_dev)
> +               return ERR_PTR(-EPROBE_DEFER);
> +
> +       led_cdev = dev_get_drvdata(led_dev);
> +
> +       if (!try_module_get(led_cdev->dev->parent->driver->owner)) {
> +               put_device(led_cdev->dev);
> +               return ERR_PTR(-ENODEV);
> +       }
> +
> +       return led_cdev;
> +}
> +
>  /**
>   * of_led_get() - request a LED device via the LED framework
>   * @np: device node to get the LED device from
> @@ -226,7 +243,6 @@ static SIMPLE_DEV_PM_OPS(leds_class_dev_pm_ops, led_suspend, led_resume);
>  struct led_classdev *of_led_get(struct device_node *np, int index)
>  {
>         struct device *led_dev;
> -       struct led_classdev *led_cdev;
>         struct device_node *led_node;
>
>         led_node = of_parse_phandle(np, "leds", index);
> @@ -236,17 +252,7 @@ struct led_classdev *of_led_get(struct device_node *np, int index)
>         led_dev = class_find_device_by_of_node(leds_class, led_node);
>         of_node_put(led_node);
>
> -       if (!led_dev)
> -               return ERR_PTR(-EPROBE_DEFER);
> -
> -       led_cdev = dev_get_drvdata(led_dev);
> -
> -       if (!try_module_get(led_cdev->dev->parent->driver->owner)) {
> -               put_device(led_cdev->dev);
> -               return ERR_PTR(-ENODEV);
> -       }
> -
> -       return led_cdev;
> +       return led_module_get(led_dev);
>  }
>  EXPORT_SYMBOL_GPL(of_led_get);
>
> --
> 2.39.0
>
Linus Walleij Jan. 20, 2023, 7:24 a.m. UTC | #2 
On Thu, Jan 19, 2023 at 2:01 PM Hans de Goede <hdegoede@redhat.com> wrote:

> Split out part of of_led_get() into a generic led_module_get() helper
> function.
>
> This is a preparation patch for adding a generic (non devicetree specific)
> led_get() function.
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
> Changes in v4:
> - Rename helper from __led_get() to led_module_get()

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 7391d2cf1370..743d97b082dc 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -215,6 +215,23 @@  static int led_resume(struct device *dev)
 
 static SIMPLE_DEV_PM_OPS(leds_class_dev_pm_ops, led_suspend, led_resume);
 
+static struct led_classdev *led_module_get(struct device *led_dev)
+{
+	struct led_classdev *led_cdev;
+
+	if (!led_dev)
+		return ERR_PTR(-EPROBE_DEFER);
+
+	led_cdev = dev_get_drvdata(led_dev);
+
+	if (!try_module_get(led_cdev->dev->parent->driver->owner)) {
+		put_device(led_cdev->dev);
+		return ERR_PTR(-ENODEV);
+	}
+
+	return led_cdev;
+}
+
 /**
  * of_led_get() - request a LED device via the LED framework
  * @np: device node to get the LED device from
@@ -226,7 +243,6 @@  static SIMPLE_DEV_PM_OPS(leds_class_dev_pm_ops, led_suspend, led_resume);
 struct led_classdev *of_led_get(struct device_node *np, int index)
 {
 	struct device *led_dev;
-	struct led_classdev *led_cdev;
 	struct device_node *led_node;
 
 	led_node = of_parse_phandle(np, "leds", index);
@@ -236,17 +252,7 @@  struct led_classdev *of_led_get(struct device_node *np, int index)
 	led_dev = class_find_device_by_of_node(leds_class, led_node);
 	of_node_put(led_node);
 
-	if (!led_dev)
-		return ERR_PTR(-EPROBE_DEFER);
-
-	led_cdev = dev_get_drvdata(led_dev);
-
-	if (!try_module_get(led_cdev->dev->parent->driver->owner)) {
-		put_device(led_cdev->dev);
-		return ERR_PTR(-ENODEV);
-	}
-
-	return led_cdev;
+	return led_module_get(led_dev);
 }
 EXPORT_SYMBOL_GPL(of_led_get);