From: Jean-Jacques Hiblot <jjhiblot@ti.com> To: Dan Murphy <dmurphy@ti.com>, jacek.anaszewski@gmail.com, pavel@ucw.cz Cc: linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org, tomi.valkeinen@ti.com Subject: Re: [PATCH v2 1/2] leds: tlc591xx: simplify driver by using the managed led API Date: Wed, 10 Jul 2019 09:44:32 +0200 [thread overview] Message-ID: <6242726a-ddb9-ab87-a28e-a1fa0ecbf87e@ti.com> (raw) In-Reply-To: <127551c1-d642-0603-f2f2-6fd4cc43bb93@ti.com> Hi Dan, On 08/07/2019 20:08, Dan Murphy wrote: > JJ > > On 7/8/19 5:06 AM, Jean-Jacques Hiblot wrote: >> Use the managed API of the LED class (devm_led_classdev_register() >> instead of led_classdev_register()). >> This allows us to remove the code used to track-and-destroy the LED >> devices > > What changed from v1? What changed is a bug fix in the loop: replaced led = &priv->leds[idx] with led = &priv->leds[reg]; > > I don't see any changes especially the bounds on the reg property. It is not quite apparent in the diff, but there is such a check. Here is what we have in the probe(): for_each_child_of_node(np, child) { struct tlc591xx_led *led; err = of_property_read_u32(child, "reg", ®); if (err) { of_node_put(child); return err; } if (reg < 0 || reg >= tlc591xx->max_leds || priv->leds[reg].active) { of_node_put(child); return -EINVAL; } led = &priv->leds[reg]; [...] } } > > Dan > > >> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> >> --- >> drivers/leds/leds-tlc591xx.c | 79 +++++++++--------------------------- >> 1 file changed, 20 insertions(+), 59 deletions(-) >> >> diff --git a/drivers/leds/leds-tlc591xx.c b/drivers/leds/leds-tlc591xx.c >> index 59ff088c7d75..3d5a4b92f016 100644 >> --- a/drivers/leds/leds-tlc591xx.c >> +++ b/drivers/leds/leds-tlc591xx.c >> @@ -128,51 +128,6 @@ tlc591xx_brightness_set(struct led_classdev >> *led_cdev, >> return err; >> } >> -static void >> -tlc591xx_destroy_devices(struct tlc591xx_priv *priv, unsigned int j) >> -{ >> - int i = j; >> - >> - while (--i >= 0) { >> - if (priv->leds[i].active) >> - led_classdev_unregister(&priv->leds[i].ldev); >> - } >> -} >> - >> -static int >> -tlc591xx_configure(struct device *dev, >> - struct tlc591xx_priv *priv, >> - const struct tlc591xx *tlc591xx) >> -{ >> - unsigned int i; >> - int err = 0; >> - >> - tlc591xx_set_mode(priv->regmap, MODE2_DIM); >> - for (i = 0; i < TLC591XX_MAX_LEDS; i++) { >> - struct tlc591xx_led *led = &priv->leds[i]; >> - >> - if (!led->active) >> - continue; >> - >> - led->priv = priv; >> - led->led_no = i; >> - led->ldev.brightness_set_blocking = tlc591xx_brightness_set; >> - led->ldev.max_brightness = LED_FULL; >> - err = led_classdev_register(dev, &led->ldev); >> - if (err < 0) { >> - dev_err(dev, "couldn't register LED %s\n", >> - led->ldev.name); >> - goto exit; >> - } >> - } >> - >> - return 0; >> - >> -exit: >> - tlc591xx_destroy_devices(priv, i); >> - return err; >> -} >> - >> static const struct regmap_config tlc591xx_regmap = { >> .reg_bits = 8, >> .val_bits = 8, >> @@ -225,7 +180,11 @@ tlc591xx_probe(struct i2c_client *client, >> i2c_set_clientdata(client, priv); >> + tlc591xx_set_mode(priv->regmap, MODE2_DIM); >> + >> for_each_child_of_node(np, child) { >> + struct tlc591xx_led *led; >> + >> err = of_property_read_u32(child, "reg", ®); >> if (err) { >> of_node_put(child); >> @@ -236,22 +195,25 @@ tlc591xx_probe(struct i2c_client *client, >> of_node_put(child); >> return -EINVAL; >> } >> - priv->leds[reg].active = true; >> - priv->leds[reg].ldev.name = >> + led = &priv->leds[reg]; >> + >> + led->active = true; >> + led->ldev.name = >> of_get_property(child, "label", NULL) ? : child->name; >> - priv->leds[reg].ldev.default_trigger = >> + led->ldev.default_trigger = >> of_get_property(child, "linux,default-trigger", NULL); >> - } >> - return tlc591xx_configure(dev, priv, tlc591xx); >> -} >> - >> -static int >> -tlc591xx_remove(struct i2c_client *client) >> -{ >> - struct tlc591xx_priv *priv = i2c_get_clientdata(client); >> - >> - tlc591xx_destroy_devices(priv, TLC591XX_MAX_LEDS); >> + led->priv = priv; >> + led->led_no = reg; >> + led->ldev.brightness_set_blocking = tlc591xx_brightness_set; >> + led->ldev.max_brightness = LED_FULL; >> + err = devm_led_classdev_register(dev, &led->ldev); >> + if (err < 0) { >> + dev_err(dev, "couldn't register LED %s\n", >> + led->ldev.name); >> + return err; >> + } >> + } >> return 0; >> } >> @@ -268,7 +230,6 @@ static struct i2c_driver tlc591xx_driver = { >> .of_match_table = of_match_ptr(of_tlc591xx_leds_match), >> }, >> .probe = tlc591xx_probe, >> - .remove = tlc591xx_remove, >> .id_table = tlc591xx_id, >> };
WARNING: multiple messages have this Message-ID (diff)
From: Jean-Jacques Hiblot <jjhiblot@ti.com> To: Dan Murphy <dmurphy@ti.com>, <jacek.anaszewski@gmail.com>, <pavel@ucw.cz> Cc: <linux-leds@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <tomi.valkeinen@ti.com> Subject: Re: [PATCH v2 1/2] leds: tlc591xx: simplify driver by using the managed led API Date: Wed, 10 Jul 2019 09:44:32 +0200 [thread overview] Message-ID: <6242726a-ddb9-ab87-a28e-a1fa0ecbf87e@ti.com> (raw) Message-ID: <20190710074432.f1u0kMCSTpTa2y1EZspWUCyWgA28ZV1Ssr9Keb48rM4@z> (raw) In-Reply-To: <127551c1-d642-0603-f2f2-6fd4cc43bb93@ti.com> Hi Dan, On 08/07/2019 20:08, Dan Murphy wrote: > JJ > > On 7/8/19 5:06 AM, Jean-Jacques Hiblot wrote: >> Use the managed API of the LED class (devm_led_classdev_register() >> instead of led_classdev_register()). >> This allows us to remove the code used to track-and-destroy the LED >> devices > > What changed from v1? What changed is a bug fix in the loop: replaced led = &priv->leds[idx] with led = &priv->leds[reg]; > > I don't see any changes especially the bounds on the reg property. It is not quite apparent in the diff, but there is such a check. Here is what we have in the probe(): for_each_child_of_node(np, child) { struct tlc591xx_led *led; err = of_property_read_u32(child, "reg", ®); if (err) { of_node_put(child); return err; } if (reg < 0 || reg >= tlc591xx->max_leds || priv->leds[reg].active) { of_node_put(child); return -EINVAL; } led = &priv->leds[reg]; [...] } } > > Dan > > >> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> >> --- >> drivers/leds/leds-tlc591xx.c | 79 +++++++++--------------------------- >> 1 file changed, 20 insertions(+), 59 deletions(-) >> >> diff --git a/drivers/leds/leds-tlc591xx.c b/drivers/leds/leds-tlc591xx.c >> index 59ff088c7d75..3d5a4b92f016 100644 >> --- a/drivers/leds/leds-tlc591xx.c >> +++ b/drivers/leds/leds-tlc591xx.c >> @@ -128,51 +128,6 @@ tlc591xx_brightness_set(struct led_classdev >> *led_cdev, >> return err; >> } >> -static void >> -tlc591xx_destroy_devices(struct tlc591xx_priv *priv, unsigned int j) >> -{ >> - int i = j; >> - >> - while (--i >= 0) { >> - if (priv->leds[i].active) >> - led_classdev_unregister(&priv->leds[i].ldev); >> - } >> -} >> - >> -static int >> -tlc591xx_configure(struct device *dev, >> - struct tlc591xx_priv *priv, >> - const struct tlc591xx *tlc591xx) >> -{ >> - unsigned int i; >> - int err = 0; >> - >> - tlc591xx_set_mode(priv->regmap, MODE2_DIM); >> - for (i = 0; i < TLC591XX_MAX_LEDS; i++) { >> - struct tlc591xx_led *led = &priv->leds[i]; >> - >> - if (!led->active) >> - continue; >> - >> - led->priv = priv; >> - led->led_no = i; >> - led->ldev.brightness_set_blocking = tlc591xx_brightness_set; >> - led->ldev.max_brightness = LED_FULL; >> - err = led_classdev_register(dev, &led->ldev); >> - if (err < 0) { >> - dev_err(dev, "couldn't register LED %s\n", >> - led->ldev.name); >> - goto exit; >> - } >> - } >> - >> - return 0; >> - >> -exit: >> - tlc591xx_destroy_devices(priv, i); >> - return err; >> -} >> - >> static const struct regmap_config tlc591xx_regmap = { >> .reg_bits = 8, >> .val_bits = 8, >> @@ -225,7 +180,11 @@ tlc591xx_probe(struct i2c_client *client, >> i2c_set_clientdata(client, priv); >> + tlc591xx_set_mode(priv->regmap, MODE2_DIM); >> + >> for_each_child_of_node(np, child) { >> + struct tlc591xx_led *led; >> + >> err = of_property_read_u32(child, "reg", ®); >> if (err) { >> of_node_put(child); >> @@ -236,22 +195,25 @@ tlc591xx_probe(struct i2c_client *client, >> of_node_put(child); >> return -EINVAL; >> } >> - priv->leds[reg].active = true; >> - priv->leds[reg].ldev.name = >> + led = &priv->leds[reg]; >> + >> + led->active = true; >> + led->ldev.name = >> of_get_property(child, "label", NULL) ? : child->name; >> - priv->leds[reg].ldev.default_trigger = >> + led->ldev.default_trigger = >> of_get_property(child, "linux,default-trigger", NULL); >> - } >> - return tlc591xx_configure(dev, priv, tlc591xx); >> -} >> - >> -static int >> -tlc591xx_remove(struct i2c_client *client) >> -{ >> - struct tlc591xx_priv *priv = i2c_get_clientdata(client); >> - >> - tlc591xx_destroy_devices(priv, TLC591XX_MAX_LEDS); >> + led->priv = priv; >> + led->led_no = reg; >> + led->ldev.brightness_set_blocking = tlc591xx_brightness_set; >> + led->ldev.max_brightness = LED_FULL; >> + err = devm_led_classdev_register(dev, &led->ldev); >> + if (err < 0) { >> + dev_err(dev, "couldn't register LED %s\n", >> + led->ldev.name); >> + return err; >> + } >> + } >> return 0; >> } >> @@ -268,7 +230,6 @@ static struct i2c_driver tlc591xx_driver = { >> .of_match_table = of_match_ptr(of_tlc591xx_leds_match), >> }, >> .probe = tlc591xx_probe, >> - .remove = tlc591xx_remove, >> .id_table = tlc591xx_id, >> };
next prev parent reply other threads:[~2019-07-10 7:44 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-08 10:06 [PATCH v2 0/2] leds: tlc591xx: switch to OF and managed API Jean-Jacques Hiblot 2019-07-08 10:06 ` Jean-Jacques Hiblot 2019-07-08 10:06 ` [PATCH v2 1/2] leds: tlc591xx: simplify driver by using the managed led API Jean-Jacques Hiblot 2019-07-08 10:06 ` Jean-Jacques Hiblot 2019-07-08 18:08 ` Dan Murphy 2019-07-08 18:08 ` Dan Murphy 2019-07-10 7:44 ` Jean-Jacques Hiblot [this message] 2019-07-10 7:44 ` Jean-Jacques Hiblot 2019-07-08 10:06 ` [PATCH v2 2/2] leds: tlc591xx: Use the OF version of the LED registration function Jean-Jacques Hiblot 2019-07-08 10:06 ` Jean-Jacques Hiblot 2019-07-31 13:14 ` [PATCH v2 0/2] leds: tlc591xx: switch to OF and managed API Tomi Valkeinen
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=6242726a-ddb9-ab87-a28e-a1fa0ecbf87e@ti.com \ --to=jjhiblot@ti.com \ --cc=dmurphy@ti.com \ --cc=jacek.anaszewski@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-leds@vger.kernel.org \ --cc=pavel@ucw.cz \ --cc=tomi.valkeinen@ti.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 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 NNTP newsgroup(s).