[PATCH -next 1/2] spi: sprd-adi: Use devm_platform_get_and_ioremap_resource()

[PATCH -next 1/2] spi: sprd-adi: Use devm_platform_get_and_ioremap_resource()

[Yang Li]

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-sprd-adi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/spi/spi-sprd-adi.c b/drivers/spi/spi-sprd-adi.c
index 3b158124d79f..22e39c4c12c4 100644
--- a/drivers/spi/spi-sprd-adi.c
+++ b/drivers/spi/spi-sprd-adi.c
@@ -541,8 +541,7 @@ static int sprd_adi_probe(struct platform_device *pdev)
 	dev_set_drvdata(&pdev->dev, ctlr);
 	sadi = spi_controller_get_devdata(ctlr);
 
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	sadi->base = devm_ioremap_resource(&pdev->dev, res);
+	sadi->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
 	if (IS_ERR(sadi->base)) {
 		ret = PTR_ERR(sadi->base);
 		goto put_ctlr;
-- 
2.20.1.7.g153144c

[PATCH -next 2/2] spi: sprd: Use devm_platform_get_and_ioremap_resource()

[Yang Li]

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-sprd.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/spi/spi-sprd.c b/drivers/spi/spi-sprd.c
index 702acaeebab2..518c7eaca84e 100644
--- a/drivers/spi/spi-sprd.c
+++ b/drivers/spi/spi-sprd.c
@@ -929,8 +929,7 @@ static int sprd_spi_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	ss = spi_controller_get_devdata(sctlr);
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	ss->base = devm_ioremap_resource(&pdev->dev, res);
+	ss->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
 	if (IS_ERR(ss->base)) {
 		ret = PTR_ERR(ss->base);
 		goto free_controller;
-- 
2.20.1.7.g153144c

Re: [PATCH -next 1/2] spi: sprd-adi: Use devm_platform_get_and_ioremap_resource()

[Baolin Wang]

On 3/27/2023 2:05 PM, 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>

Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>

> ---
>   drivers/spi/spi-sprd-adi.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/spi/spi-sprd-adi.c b/drivers/spi/spi-sprd-adi.c
> index 3b158124d79f..22e39c4c12c4 100644
> --- a/drivers/spi/spi-sprd-adi.c
> +++ b/drivers/spi/spi-sprd-adi.c
> @@ -541,8 +541,7 @@ static int sprd_adi_probe(struct platform_device *pdev)
>   	dev_set_drvdata(&pdev->dev, ctlr);
>   	sadi = spi_controller_get_devdata(ctlr);
>   
> -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	sadi->base = devm_ioremap_resource(&pdev->dev, res);
> +	sadi->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
>   	if (IS_ERR(sadi->base)) {
>   		ret = PTR_ERR(sadi->base);
>   		goto put_ctlr;

Re: [PATCH -next 2/2] spi: sprd: Use devm_platform_get_and_ioremap_resource()

[Baolin Wang]

On 3/27/2023 2:05 PM, 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>

Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>

> ---
>   drivers/spi/spi-sprd.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/spi/spi-sprd.c b/drivers/spi/spi-sprd.c
> index 702acaeebab2..518c7eaca84e 100644
> --- a/drivers/spi/spi-sprd.c
> +++ b/drivers/spi/spi-sprd.c
> @@ -929,8 +929,7 @@ static int sprd_spi_probe(struct platform_device *pdev)
>   		return -ENOMEM;
>   
>   	ss = spi_controller_get_devdata(sctlr);
> -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	ss->base = devm_ioremap_resource(&pdev->dev, res);
> +	ss->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
>   	if (IS_ERR(ss->base)) {
>   		ret = PTR_ERR(ss->base);
>   		goto free_controller;

Re: [PATCH -next 1/2] spi: sprd-adi: Use devm_platform_get_and_ioremap_resource()

[Mark Brown]

On Mon, 27 Mar 2023 14:05:15 +0800, 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.
> 
> 
> [...]

Applied to

   broonie/spi.git for-next

Thanks!

[1/2] spi: sprd-adi: Use devm_platform_get_and_ioremap_resource()
      commit: 8499d4b5970f5fd135ee8860075768562a5efe70
[2/2] spi: sprd: Use devm_platform_get_and_ioremap_resource()
      commit: 5936e77c202add2cc20c21cd4486ace1a362bd43

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark