Re: [PATCH] led/led-class: Handle LEDs with the same name

[Bryan Wu]

On Wed, Feb 11, 2015 at 4:26 AM, Ricardo Ribalda Delgado
<ricardo.ribalda@xxxxxxxxx> wrote:
> The current code expected that every LED had an unique name. This is a
> legit expectation when the device tree can no be modified or extended.
> But with device tree overlays this requirement can be easily broken.
>

Could you please give me some real error message or example about this
device tree overlays? Looks like it's not only for LED subsystem and
how is it handled in other subsystem?

> This patch finds out if the name is already in use and adds the suffix
> _1, _2... if not.
>
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@xxxxxxxxx>
> ---
>  drivers/leds/led-class.c | 30 ++++++++++++++++++++++++++++--
>  1 file changed, 28 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
> index dbeebac..b60f942 100644
> --- a/drivers/leds/led-class.c
> +++ b/drivers/leds/led-class.c
> @@ -208,6 +208,13 @@ static const struct dev_pm_ops leds_class_dev_pm_ops = {
>         .resume         = led_resume,
>  };
>
> +static int match_child(struct device *dev, void *data)
> +{
> +       if (!dev_name(dev))
> +               return 0;
> +       return !strcmp(dev_name(dev), (char *)data);

strncmp instead of strcmp?

> +}
> +
>  /**
>   * led_classdev_register - register a new object of led_classdev class.
>   * @parent: The device to register.
> @@ -215,9 +222,28 @@ static const struct dev_pm_ops leds_class_dev_pm_ops = {
>   */
>  int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
>  {
> +       char *name;
> +       char *temp_name = NULL;
> +       int i = 0;
> +
> +       do {
> +               if (i == 0)
> +                       name = (char *)led_cdev->name;
> +               else {
> +                       kfree(temp_name);
> +                       temp_name = kasprintf(GFP_KERNEL, "%s_%d",
> +                                             led_cdev->name, i);
> +                       if (!temp_name)
> +                               return -ENOMEM;
> +                       name = temp_name;
> +               }
> +
> +               i++;
> +       } while (device_find_child(parent, name, match_child));
> +

I still think we need solve this issue in device tree core code not in
the user of DT.

>         led_cdev->dev = device_create_with_groups(leds_class, parent, 0,
> -                                       led_cdev, led_cdev->groups,
> -                                       "%s", led_cdev->name);
> +                                       led_cdev, led_cdev->groups, name);
> +       kfree(temp_name);
>         if (IS_ERR(led_cdev->dev))
>                 return PTR_ERR(led_cdev->dev);
>
> --
> 2.1.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/