| Message ID | 20230328061524.77529-1-yang.lee@linux.alibaba.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0623ec17c45ed3e96880453f69461d526dc97f41 |
| Headers | show |
| Series | [-next] spi: xilinx: Use devm_platform_get_and_ioremap_resource() | expand |
On 3/28/23 08:15, 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-xilinx.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c > index 5dd3d1901412..8e6e3876aa9a 100644 > --- a/drivers/spi/spi-xilinx.c > +++ b/drivers/spi/spi-xilinx.c > @@ -440,8 +440,7 @@ static int xilinx_spi_probe(struct platform_device *pdev) > xspi->bitbang.txrx_bufs = xilinx_spi_txrx_bufs; > init_completion(&xspi->done); > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - xspi->regs = devm_ioremap_resource(&pdev->dev, res); > + xspi->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res); > if (IS_ERR(xspi->regs)) > return PTR_ERR(xspi->regs); > > -- > 2.20.1.7.g153144c > Reviewed-by: Michal Simek <michal.simek@amd.com> Thanks, Michal
On Tue, 28 Mar 2023 14:15:24 +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 https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/1] spi: xilinx: Use devm_platform_get_and_ioremap_resource() commit: 0623ec17c45ed3e96880453f69461d526dc97f41 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
On 3/28/23 07:15, 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-xilinx.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c > index 5dd3d1901412..8e6e3876aa9a 100644 > --- a/drivers/spi/spi-xilinx.c > +++ b/drivers/spi/spi-xilinx.c > @@ -440,8 +440,7 @@ static int xilinx_spi_probe(struct platform_device *pdev) > xspi->bitbang.txrx_bufs = xilinx_spi_txrx_bufs; > init_completion(&xspi->done); > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - xspi->regs = devm_ioremap_resource(&pdev->dev, res); > + xspi->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res); > if (IS_ERR(xspi->regs)) > return PTR_ERR(xspi->regs); > So we keep the local var res just to print its value? Wouldn't have been better to have something like: diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c index 1411548f4255..693be1eacaca 100644 --- a/drivers/spi/spi-xilinx.c +++ b/drivers/spi/spi-xilinx.c @@ -391,7 +391,6 @@ static int xilinx_spi_probe(struct platform_device *pdev) { struct xilinx_spi *xspi; struct xspi_platform_data *pdata; - struct resource *res; int ret, num_cs = 0, bits_per_word; struct spi_master *master; bool force_irq = false; @@ -440,8 +439,7 @@ static int xilinx_spi_probe(struct platform_device *pdev) xspi->bitbang.txrx_bufs = xilinx_spi_txrx_bufs; init_completion(&xspi->done); - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - xspi->regs = devm_ioremap_resource(&pdev->dev, res); + xspi->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(xspi->regs)) return PTR_ERR(xspi->regs); @@ -493,7 +491,7 @@ static int xilinx_spi_probe(struct platform_device *pdev) return ret; } - dev_info(&pdev->dev, "at %pR, irq=%d\n", res, xspi->irq); + dev_info(&pdev->dev, "irq=%d\n", xspi->irq); if (pdata) { for (i = 0; i < pdata->num_devices; i++) --- I would get rid of printing xspi->irq too, as I don't see any benefit in printing it, but that would be for another patch, as it is a different logical change.
diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c index 5dd3d1901412..8e6e3876aa9a 100644 --- a/drivers/spi/spi-xilinx.c +++ b/drivers/spi/spi-xilinx.c @@ -440,8 +440,7 @@ static int xilinx_spi_probe(struct platform_device *pdev) xspi->bitbang.txrx_bufs = xilinx_spi_txrx_bufs; init_completion(&xspi->done); - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - xspi->regs = devm_ioremap_resource(&pdev->dev, res); + xspi->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res); if (IS_ERR(xspi->regs)) return PTR_ERR(xspi->regs);
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-xilinx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)