[-next] spi: rockchip-sfc: Use devm_platform_get_and_ioremap_resource()

Message ID 20230328062118.86336-1-yang.lee@linux.alibaba.com
State New
Headers
Series [-next] spi: rockchip-sfc: Use devm_platform_get_and_ioremap_resource() |

Commit Message

Yang Li March 28, 2023, 6:21 a.m. UTC
  According to commit 890cc39a8799 ("drivers: provide
devm_platform_get_and_ioremap_resource()"), convert
platform_get_resource(), devm_ioremap_resource() to a single
call to devm_platform_get_and_ioremap_resource(), as this is exactly
what this function does.

Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
 drivers/spi/spi-rockchip-sfc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
  

Comments

Tudor Ambarus March 28, 2023, 3:14 p.m. UTC | #1
On 3/28/23 07:21, Yang Li wrote:
> According to commit 890cc39a8799 ("drivers: provide
> devm_platform_get_and_ioremap_resource()"), convert
> platform_get_resource(), devm_ioremap_resource() to a single
> call to devm_platform_get_and_ioremap_resource(), as this is exactly
> what this function does.
> 
> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
> ---
>  drivers/spi/spi-rockchip-sfc.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

If I were you I would make a single patch addressing all the drivers
from SPI as this is a single logical change. You get extra points as you
avoid polluting the log.

> 
> diff --git a/drivers/spi/spi-rockchip-sfc.c b/drivers/spi/spi-rockchip-sfc.c
> index 4fabd2e0439f..6830ecaa270b 100644
> --- a/drivers/spi/spi-rockchip-sfc.c
> +++ b/drivers/spi/spi-rockchip-sfc.c
> @@ -576,8 +576,7 @@ static int rockchip_sfc_probe(struct platform_device *pdev)
>  	sfc = spi_master_get_devdata(master);
>  	sfc->dev = dev;
>  
> -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	sfc->regbase = devm_ioremap_resource(dev, res);
> +	sfc->regbase = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

No, you better use devm_platform_ioremap_resource() as res is not used
afterwards. You'll get rid of the local variable too.

>  	if (IS_ERR(sfc->regbase))
>  		return PTR_ERR(sfc->regbase);
>
  
Tudor Ambarus March 29, 2023, 7:18 a.m. UTC | #2
On 3/29/23 07:06, Yang.Lee wrote:
> 
> From:Tudor Ambarus <tudor.ambarus@linaro.org>
> Send Time:2023年3月28日(星期二) 23:16
>> If I were you I would make a single patch addressing all the drivers
>> from SPI as this is a single logical change. You get extra points as you
>> avoid polluting the log.
> 
> First of all, thank you for pointing out this.
> Because the maintainer list of each SPI driver file is not identical, I am worried about causing trouble for too many people, so I split it into multiple patches based on this.

The change is trivial enough to don't bother at all. Here's an example:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=4b23603a251d24022f2fa48ee67610eb245a4115
> 
>> No, you better use devm_platform_ioremap_resource() as res is not used
>> afterwards. You'll get rid of the local variable too.
> 
> It's my bad, I will send a new version.
> 
> Regards,
> Yang Li
>
  
Mark Brown March 30, 2023, 12:15 a.m. UTC | #3
On Wed, Mar 29, 2023 at 08:18:27AM +0100, Tudor Ambarus wrote:
> On 3/29/23 07:06, Yang.Lee wrote:

> > Because the maintainer list of each SPI driver file is not identical, I am worried about causing trouble for too many people, so I split it into multiple patches based on this.

> The change is trivial enough to don't bother at all. Here's an example:
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=4b23603a251d24022f2fa48ee67610eb245a4115

No, it's fine - it doesn't really get in the way and can be
helpful to people doing backports.
  

Patch

diff --git a/drivers/spi/spi-rockchip-sfc.c b/drivers/spi/spi-rockchip-sfc.c
index 4fabd2e0439f..6830ecaa270b 100644
--- a/drivers/spi/spi-rockchip-sfc.c
+++ b/drivers/spi/spi-rockchip-sfc.c
@@ -576,8 +576,7 @@  static int rockchip_sfc_probe(struct platform_device *pdev)
 	sfc = spi_master_get_devdata(master);
 	sfc->dev = dev;
 
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	sfc->regbase = devm_ioremap_resource(dev, res);
+	sfc->regbase = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
 	if (IS_ERR(sfc->regbase))
 		return PTR_ERR(sfc->regbase);