linux-leds.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] leds: use devm_platform_ioremap_resource_byname()
@ 2020-02-14 15:48 qiwuchen55
  2020-02-26 13:53 ` Pavel Machek
  0 siblings, 1 reply; 3+ messages in thread
From: qiwuchen55 @ 2020-02-14 15:48 UTC (permalink / raw)
  To: jacek.anaszewski, pavel, dmurphy; +Cc: linux-leds, chenqiwu

From: chenqiwu <chenqiwu@xiaomi.com>

Use devm_platform_ioremap_resource_byname() instead of calling
platform_get_resource_byname() and devm_ioremap_resource() separately.

Signed-off-by: chenqiwu <chenqiwu@xiaomi.com>
---
 drivers/leds/leds-cobalt-qube.c | 12 +++---------
 drivers/leds/leds-cobalt-raq.c  | 12 ++++--------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/drivers/leds/leds-cobalt-qube.c b/drivers/leds/leds-cobalt-qube.c
index ef22e1e..76af9d8 100644
--- a/drivers/leds/leds-cobalt-qube.c
+++ b/drivers/leds/leds-cobalt-qube.c
@@ -36,15 +36,9 @@ static void qube_front_led_set(struct led_classdev *led_cdev,
 
 static int cobalt_qube_led_probe(struct platform_device *pdev)
 {
-	struct resource *res;
-
-	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);
diff --git a/drivers/leds/leds-cobalt-raq.c b/drivers/leds/leds-cobalt-raq.c
index 045c239..8b1317d 100644
--- a/drivers/leds/leds-cobalt-raq.c
+++ b/drivers/leds/leds-cobalt-raq.c
@@ -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;
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] leds: use devm_platform_ioremap_resource_byname()
  2020-02-14 15:48 [PATCH] leds: use devm_platform_ioremap_resource_byname() qiwuchen55
@ 2020-02-26 13:53 ` Pavel Machek
  2020-02-26 15:17   ` chenqiwu
  0 siblings, 1 reply; 3+ messages in thread
From: Pavel Machek @ 2020-02-26 13:53 UTC (permalink / raw)
  To: qiwuchen55; +Cc: jacek.anaszewski, dmurphy, linux-leds, chenqiwu

[-- Attachment #1: Type: text/plain, Size: 2388 bytes --]

Hi!

> From: chenqiwu <chenqiwu@xiaomi.com>
> 
> Use devm_platform_ioremap_resource_byname() instead of calling
> platform_get_resource_byname() and devm_ioremap_resource() separately.
> 
> Signed-off-by: chenqiwu <chenqiwu@xiaomi.com>

Was this tested? Can you cc driver authors to get it tested?

> index ef22e1e..76af9d8 100644
> --- a/drivers/leds/leds-cobalt-qube.c
> +++ b/drivers/leds/leds-cobalt-qube.c
> @@ -36,15 +36,9 @@ static void qube_front_led_set(struct led_classdev *led_cdev,
>  
>  static int cobalt_qube_led_probe(struct platform_device *pdev)
>  {
> -	struct resource *res;
> -
> -	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);
> diff --git a/drivers/leds/leds-cobalt-raq.c b/drivers/leds/leds-cobalt-raq.c
> index 045c239..8b1317d 100644
> --- a/drivers/leds/leds-cobalt-raq.c
> +++ b/drivers/leds/leds-cobalt-raq.c
> @@ -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;

How is it that manual devm_ioremap_release() is neccessary here but
not in the other driver?

Best regards,
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] leds: use devm_platform_ioremap_resource_byname()
  2020-02-26 13:53 ` Pavel Machek
@ 2020-02-26 15:17   ` chenqiwu
  0 siblings, 0 replies; 3+ messages in thread
From: chenqiwu @ 2020-02-26 15:17 UTC (permalink / raw)
  To: Pavel Machek; +Cc: jacek.anaszewski, dmurphy, linux-leds, chenqiwu

Hi, Pavel,
> 
> > From: chenqiwu <chenqiwu@xiaomi.com>
> > 
> > Use devm_platform_ioremap_resource_byname() instead of calling
> > platform_get_resource_byname() and devm_ioremap_resource() separately.
> > 
> > Signed-off-by: chenqiwu <chenqiwu@xiaomi.com>
> 
> Was this tested? Can you cc driver authors to get it tested?

I will resend this patch cc driver authors to get it tested.
 
> > index ef22e1e..76af9d8 100644
> > --- a/drivers/leds/leds-cobalt-qube.c
> > +++ b/drivers/leds/leds-cobalt-qube.c
> > @@ -36,15 +36,9 @@ static void qube_front_led_set(struct led_classdev *led_cdev,
> >  
> >  static int cobalt_qube_led_probe(struct platform_device *pdev)
> >  {
> > -	struct resource *res;
> > -
> > -	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);
> > diff --git a/drivers/leds/leds-cobalt-raq.c b/drivers/leds/leds-cobalt-raq.c
> > index 045c239..8b1317d 100644
> > --- a/drivers/leds/leds-cobalt-raq.c
> > +++ b/drivers/leds/leds-cobalt-raq.c
> > @@ -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;
> 
> How is it that manual devm_ioremap_release() is neccessary here but
> not in the other driver?

Thanks for your remind! This is neccessary for leds-cobalt-qube driver
to apply, too.

BRs,
Qiwu

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-26 15:17 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-14 15:48 [PATCH] leds: use devm_platform_ioremap_resource_byname() qiwuchen55
2020-02-26 13:53 ` Pavel Machek
2020-02-26 15:17   ` chenqiwu

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).