Skip to contentSkip to conversation

spi: omap2-mcspi: Use devm_platform_get_and_ioremap_resource()

PATCH In review Yang Li 3 participants 5 messages Mar 27, 2023 SPI

lore
Share & tools
lore

Yang Li

author
#0 lore raw

PATCH 1/3 spi: omap2-mcspi: Use devm_platform_get_and_ioremap_resource()

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.

---
 drivers/spi/spi-omap2-mcspi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/spi/spi-omap2-mcspi.c +1 -2
index d95f0ae033ca..8331e247bf5c 100644
@@ -1477,8 +1477,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
 		master->max_transfer_size = omap2_mcspi_max_xfer_size;
 	}
 
-	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	mcspi->base = devm_ioremap_resource(&pdev->dev, r);
+	mcspi->base = devm_platform_get_and_ioremap_resource(pdev, 0, &r);
 	if (IS_ERR(mcspi->base)) {
 		status = PTR_ERR(mcspi->base);
 		goto free_master;
Signature · 1 line
2.20.1.7.g153144c
author
#1 lore raw

PATCH 2/3 spi: orion: Use devm_platform_get_and_ioremap_resource()

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.

---
 drivers/spi/spi-orion.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/spi/spi-orion.c +1 -2
index bb244b596143..ad9e83e34297 100644
@@ -728,8 +728,7 @@ static int orion_spi_probe(struct platform_device *pdev)
 		master->max_speed_hz = devdata->max_hz;
 	master->min_speed_hz = DIV_ROUND_UP(tclk_hz, devdata->max_divisor);
 
-	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	spi->base = devm_ioremap_resource(&pdev->dev, r);
+	spi->base = devm_platform_get_and_ioremap_resource(pdev, 0, &r);
 	if (IS_ERR(spi->base)) {
 		status = PTR_ERR(spi->base);
 		goto out_rel_axi_clk;
Signature · 1 line
2.20.1.7.g153144c
author
#2 lore raw

PATCH 3/3 spi: pic32: Use devm_platform_get_and_ioremap_resource()

In reply to 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.

---
 drivers/spi/spi-pic32.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/spi/spi-pic32.c +1 -2
index 8a02073a354d..f2af5e653f3d 100644
@@ -710,8 +710,7 @@ static int pic32_spi_hw_probe(struct platform_device *pdev,
 	struct resource *mem;
 	int ret;
 
-	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	pic32s->regs = devm_ioremap_resource(&pdev->dev, mem);
+	pic32s->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &mem);
 	if (IS_ERR(pic32s->regs))
 		return PTR_ERR(pic32s->regs);
 
Signature · 1 line
2.20.1.7.g153144c
Reviewed-by on v1 1/3
#3 lore raw
In reply to Yang Li
Quoted 8 lines · 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.

---

For the series,

Quoted 17 lines
 drivers/spi/spi-omap2-mcspi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/spi/spi-omap2-mcspi.c +1 -2
index d95f0ae033ca..8331e247bf5c 100644
@@ -1477,8 +1477,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
 		master->max_transfer_size = omap2_mcspi_max_xfer_size;
 	}
 
-	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	mcspi->base = devm_ioremap_resource(&pdev->dev, r);
+	mcspi->base = devm_platform_get_and_ioremap_resource(pdev, 0, &r);
 	if (IS_ERR(mcspi->base)) {
 		status = PTR_ERR(mcspi->base);
 		goto free_master;
Signature · 3 lines
Best regards,
Dhruva Gole
Texas Instruments Incorporated
maintainer
#4 lore raw
In reply to Yang Li
Quoted 8 lines · 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.

[...]

Applied to

broonie/spi.git for-next

Thanks!

[1/3] spi: omap2-mcspi: Use devm_platform_get_and_ioremap_resource()

      commit: 5e72620125dfa6b876ea3fe3ad25e4c11b70615a
[2/3] spi: orion: Use devm_platform_get_and_ioremap_resource()
      commit: 36b49126afa22b7f9fe3b16360ef2ab3da6bc376
[3/3] spi: pic32: Use devm_platform_get_and_ioremap_resource()
      commit: d10c878213b0bd2df18639f62af28e93a36d437d

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