leds: use devm_platform_ioremap_resource() API to simplify code
PATCH v2 1/1 leds: use devm_platform_ioremap_resource() API to simplify code
From: chenqiwu <[email protected]>
Dear Florian and Yoichi,
Could you please help review and test this patch?
chenqiwu (1):
leds: use devm_platform_ioremap_resource() API to simplify code
drivers/leds/leds-cobalt-qube.c | 20 +++++++++++--------- drivers/leds/leds-cobalt-raq.c | 12 ++++-------- 2 files changed, 15 insertions(+), 17 deletions(-)
Signature · 4 lines
1.9.1 Thanks a lot! Qiwu
PATCH v2 1/1 leds: use devm_platform_ioremap_resource() API to simplify code
From: chenqiwu <[email protected]>
1. Use a wrapped API devm_platform_ioremap_resource() instead of calling platform_get_resource() and devm_ioremap_resource() separately to simplify code.
2. Add error checking and error processing for led driver probe.
---
changes in v2:
- Add error checking and error processing for led driver probe.
- Modify the commit title and message.
--- drivers/leds/leds-cobalt-qube.c | 20 +++++++++++--------- drivers/leds/leds-cobalt-raq.c | 12 ++++-------- 2 files changed, 15 insertions(+), 17 deletions(-)
drivers/leds/leds-cobalt-qube.c +11 -9
@@ -36,20 +36,22 @@ static void qube_front_led_set(struct led_classdev *led_cdev,static int cobalt_qube_led_probe (struct platform_device *pdev) { -struct resource *res; +int retval; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (!res) -return -EBUSY ; - - led_port =devm_ioremap (&pdev->dev, res->start,resource_size (res)); -if (!led_port) -return -ENOMEM ; + led_port =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (led_port)) +return PTR_ERR (led_port); led_value =LED_FRONT_LEFT |LED_FRONT_RIGHT ;writeb (led_value, led_port); -return devm_led_classdev_register (&pdev->dev, &qube_front_led); + retval =devm_led_classdev_register (&pdev->dev, &qube_front_led); +if (retval) { +devm_ioremap_release (&pdev->dev, led_port); + led_port =NULL ; + } + +return retval; }static struct platform_driver cobalt_qube_led_driver = {
drivers/leds/leds-cobalt-raq.c +4 -8
@@ -65,16 +65,11 @@ static void raq_power_off_led_set(struct led_classdev *led_cdev,static int cobalt_raq_led_probe (struct platform_device *pdev) { -struct resource *res;int retval; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (!res) -return -EBUSY ; - - led_port =devm_ioremap (&pdev->dev, res->start,resource_size (res)); -if (!led_port) -return -ENOMEM ; + led_port =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (led_port)) +return PTR_ERR (led_port); retval =led_classdev_register (&pdev->dev, &raq_power_off_led);if (retval)
@@ -90,6 +85,7 @@ static int cobalt_raq_led_probe(struct platform_device *pdev)led_classdev_unregister (&raq_power_off_led); err_null: +devm_ioremap_release (&pdev->dev, led_port); led_port =NULL ;return retval;
Signature · 1 line
1.9.1
Hi!
Quoted 8 lines
From: chenqiwu <[email protected]>
1. Use a wrapped API
devm_platform_ioremap_resource()instead of callingplatform_get_resource()anddevm_ioremap_resource()separately to simplify code.
2. Add error checking and error processing for led driver probe.Signed-off-by chenqiwu <[email protected]>
Do you still want me to apply this?
Did someone test it?
Quoted 18 lines
+++
b/drivers/leds/leds-cobalt-qube.cdrivers/leds/leds-cobalt-qube.c +4
-8@@ -36,20 +36,22 @@ static void qube_front_led_set(struct led_classdev *led_cdev,static int cobalt_qube_led_probe (struct platform_device *pdev) { -struct resource *res; +int retval; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (!res) -return -EBUSY ; - - led_port =devm_ioremap (&pdev->dev, res->start,resource_size (res)); -if (!led_port) -return -ENOMEM ; + led_port =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (led_port)) +return PTR_ERR (led_port);
drivers/leds/leds-cobalt-qube.c static void qube_front_led_set(struct led_classdev *led_cdev, · line 52
Quoted 10 lines
drivers/leds/leds-cobalt-qube.c +5
-1led_value =LED_FRONT_LEFT |LED_FRONT_RIGHT ;writeb (led_value, led_port); -return devm_led_classdev_register (&pdev->dev, &qube_front_led); + retval =devm_led_classdev_register (&pdev->dev, &qube_front_led); +if (retval) { +devm_ioremap_release (&pdev->dev, led_port); + led_port =NULL ; + }
Do we need to do the devm_..._release?
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html