leds: Allow to call led_classdev_unregister() unconditionally
PATCH 1/1 leds: Allow to call led_classdev_unregister() unconditionally
If in the certain driver the LED is optional, and it's a majority of them, the call of led_classdev_unregister() still requires some additional checks.
The usual pattern on unregistering is to check for NULL, but we also check for IS_ERR() in case device_create_with_groups() fails.
The change will reduce a burden in a lot of drivers to repeatedly check for above conditions.
--- drivers/leds/led-class.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/leds/led-class.c +4 -0
@@ -287,6 +287,7 @@ int led_classdev_register_ext(struct device *parent, ret =led_add_brightness_hw_changed (led_cdev);if (ret) {device_unregister (led_cdev->dev); + led_cdev->dev =NULL ;mutex_unlock (&led_cdev->led_access);return ret; }
@@ -332,6 +333,9 @@ EXPORT_SYMBOL_GPL(led_classdev_register_ext);*/ void led_classdev_unregister (struct led_classdev *led_cdev) { +if (IS_ERR_OR_NULL (led_cdev->dev)) +return ; +#ifdef CONFIG_LEDS_TRIGGERS down_write (&led_cdev->trigger_lock);if (led_cdev->trigger)
Signature · 1 line
2.23.0.rc1
Hi!
Quoted 8 lines
If in the certain driver the LED is optional, and it's a majority of them, the call of
led_classdev_unregister()still requires some additional checks.The usual pattern on unregistering is to check for NULL, but we also check for
IS_ERR()in casedevice_create_with_groups()fails.The change will reduce a burden in a lot of drivers to repeatedly check for above conditions.
I don't see majority of calls being protected. Doing nothing on NULL sounds reasonable. I'm less sure about "IS_ERR"...
Best regards,
Pavel
Quoted 27 lines
Signed-off-by Andy Shevchenko <[email protected]>--- drivers/leds/led-class.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/leds/led-class.c +4
-0@@ -287,6 +287,7 @@ int led_classdev_register_ext(struct device *parent, ret =led_add_brightness_hw_changed (led_cdev);if (ret) {device_unregister (led_cdev->dev); + led_cdev->dev =NULL ;mutex_unlock (&led_cdev->led_access);return ret; }@@ -332,6 +333,9 @@ EXPORT_SYMBOL_GPL(led_classdev_register_ext);*/ void led_classdev_unregister (struct led_classdev *led_cdev) { +if (IS_ERR_OR_NULL (led_cdev->dev)) +return ; +#ifdef CONFIG_LEDS_TRIGGERS down_write (&led_cdev->trigger_lock);if (led_cdev->trigger)
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Quoted 5 lines · Pavel Machek
Hi!
Quoted 3 lines
If in the certain driver the LED is optional, and it's a majority of them, the call of
led_classdev_unregister()still requires some additional checks.
Quoted 8 lines
Quoted 5 lines
The usual pattern on unregistering is to check for NULL, but we also check for
IS_ERR()in casedevice_create_with_groups()fails.The change will reduce a burden in a lot of drivers to repeatedly check for above conditions.
I don't see majority of calls being protected. Doing nothing on NULL sounds reasonable. I'm less sure about "
IS_ERR"...
Majority by drivers, not by absolute number of calls you can grep for.
What I'm referring to is, for example,
commit 99fef587ff98894426d9bf1f5b7336345052d4b3
Author: Andy Shevchenko <[email protected]>
Date: Mon Dec 3 20:21:41 2018 +0200
driver core: platform: Respect return code of platform_device_register_full()
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 5 lines · Pavel Machek
Hi!
Quoted 3 lines
If in the certain driver the LED is optional, and it's a majority of them, the call of
led_classdev_unregister()still requires some additional checks.
Quoted 8 lines
Quoted 5 lines
The usual pattern on unregistering is to check for NULL, but we also check for
IS_ERR()in casedevice_create_with_groups()fails.The change will reduce a burden in a lot of drivers to repeatedly check for above conditions.
I don't see majority of calls being protected. Doing nothing on NULL sounds reasonable. I'm less sure about "
IS_ERR"...
device_create_groups_vargs() returns ERR_PTR(retval) on error so led_cdev->dev may be left non-NULL even on error.
We can be correct checking only for NULL if we will add "led_cdev->dev = NULL" assignment in "if (IS_ERR(led_cdev->dev)" branch in led_classdev_register_ext(). Nonetheless I'm personally in favor of Andy's solution.
Signature · 2 lines
Best regards, Jacek Anaszewski
Quoted 15 lines · Jacek Anaszewski
Quoted 5 lines · Pavel Machek
Hi!
Quoted 3 lines
If in the certain driver the LED is optional, and it's a majority of them, the call of
led_classdev_unregister()still requires some additional checks.Quoted 8 lines
Quoted 5 lines
The usual pattern on unregistering is to check for NULL, but we also check for
IS_ERR()in casedevice_create_with_groups()fails.The change will reduce a burden in a lot of drivers to repeatedly check for above conditions.
I don't see majority of calls being protected. Doing nothing on NULL sounds reasonable. I'm less sure about "
IS_ERR"...
Quoted 8 lines
device_create_groups_vargs()returnsERR_PTR(retval)on error soled_cdev->devmay be left non-NULL even on error.We can be correct checking only for NULL if we will add "
led_cdev->dev= NULL" assignment in "if (IS_ERR(led_cdev->dev)" branch inled_classdev_register_ext(). Nonetheless I'm personally in favor of Andy's solution.
Patch applied, thanks.
Signature · 2 lines
Best regards, Jacek Anaszewski