2023-09-12 12:11:46

by Bartosz Golaszewski

Subject: [RFT PATCH 3/3] gpio: eic-sprd: use devm_platform_ioremap_resource()

From: Bartosz Golaszewski <[email protected]>

Make two calls into one by using devm_platform_ioremap_resource().

Signed-off-by: Bartosz Golaszewski <[email protected]>
---
drivers/gpio/gpio-eic-sprd.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpio/gpio-eic-sprd.c b/drivers/gpio/gpio-eic-sprd.c
index be7f2fa5aa7b..1e548e4e4cb8 100644
--- a/drivers/gpio/gpio-eic-sprd.c
+++ b/drivers/gpio/gpio-eic-sprd.c
@@ -594,7 +594,6 @@ static int sprd_eic_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct gpio_irq_chip *irq;
struct sprd_eic *sprd_eic;
- struct resource *res;
int ret, i;

pdata = of_device_get_match_data(dev);
@@ -621,11 +620,7 @@ static int sprd_eic_probe(struct platform_device *pdev)
* have one bank EIC, thus base[1] and base[2] can be
* optional.
*/
- res = platform_get_resource(pdev, IORESOURCE_MEM, i);
- if (!res)
- break;
-
- sprd_eic->base[i] = devm_ioremap_resource(dev, res);
+ sprd_eic->base[i] = devm_platform_ioremap_resource(pdev, i);
if (IS_ERR(sprd_eic->base[i]))
return PTR_ERR(sprd_eic->base[i]);
}
--
2.39.2

2023-09-12 12:33:34

by Andy Shevchenko

Subject: Re: [RFT PATCH 3/3] gpio: eic-sprd: use devm_platform_ioremap_resource()

On Tue, Sep 12, 2023 at 11:45:19AM +0200, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <[email protected]>
>
> Make two calls into one by using devm_platform_ioremap_resource().

...

> - res = platform_get_resource(pdev, IORESOURCE_MEM, i);
> - if (!res)
> - break;
> -
> - sprd_eic->base[i] = devm_ioremap_resource(dev, res);
> + sprd_eic->base[i] = devm_platform_ioremap_resource(pdev, i);
> if (IS_ERR(sprd_eic->base[i]))
> return PTR_ERR(sprd_eic->base[i]);

break != return

--
With Best Regards,
Andy Shevchenko

2023-09-12 12:36:23

by Baolin Wang

Subject: Re: [RFT PATCH 3/3] gpio: eic-sprd: use devm_platform_ioremap_resource()

On 9/12/2023 6:09 PM, Bartosz Golaszewski wrote:
> On Tue, Sep 12, 2023 at 12:05 PM Baolin Wang
> <[email protected]> wrote:
>>
>>
>>
>> On 9/12/2023 5:45 PM, Bartosz Golaszewski wrote:
>>> From: Bartosz Golaszewski <[email protected]>
>>>
>>> Make two calls into one by using devm_platform_ioremap_resource().
>>>
>>> Signed-off-by: Bartosz Golaszewski <[email protected]>
>>
>> Please don't do this. See the previous commit:
>> 4ed7d7dd4890bb8120a3e77c16191a695fdfcc5a ("Revert "gpio: eic-sprd: Use
>> devm_platform_ioremap_resource()"")
>>
>
> Ah, I see. Dropped. Could use a comment describing the problem though.

Yes, I think so, in case someone does the same thing in the future.

>>> ---
>>> drivers/gpio/gpio-eic-sprd.c | 7 +------
>>> 1 file changed, 1 insertion(+), 6 deletions(-)
>>>
>>> diff --git a/drivers/gpio/gpio-eic-sprd.c b/drivers/gpio/gpio-eic-sprd.c
>>> index be7f2fa5aa7b..1e548e4e4cb8 100644
>>> --- a/drivers/gpio/gpio-eic-sprd.c
>>> +++ b/drivers/gpio/gpio-eic-sprd.c
>>> @@ -594,7 +594,6 @@ static int sprd_eic_probe(struct platform_device *pdev)
>>> struct device *dev = &pdev->dev;
>>> struct gpio_irq_chip *irq;
>>> struct sprd_eic *sprd_eic;
>>> - struct resource *res;
>>> int ret, i;
>>>
>>> pdata = of_device_get_match_data(dev);
>>> @@ -621,11 +620,7 @@ static int sprd_eic_probe(struct platform_device *pdev)
>>> * have one bank EIC, thus base[1] and base[2] can be
>>> * optional.
>>> */
>>> - res = platform_get_resource(pdev, IORESOURCE_MEM, i);
>>> - if (!res)
>>> - break;
>>> -
>>> - sprd_eic->base[i] = devm_ioremap_resource(dev, res);
>>> + sprd_eic->base[i] = devm_platform_ioremap_resource(pdev, i);
>>> if (IS_ERR(sprd_eic->base[i]))
>>> return PTR_ERR(sprd_eic->base[i]);
>>> }