| Message ID | 20240826125913.3434305-2-ruanjinjie@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c2ea9b8a536bd18b7632d4d998c20e1af9319c32 |
| Headers | show |
| Series | spi: atmel-quadspi: Fix uninitialized res | expand |
Hello, On 8/26/24 6:29 PM, Jinjie Ruan wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > The second platform_get_resource_byname() can not be replaced with > devm_platform_ioremap_resource_byname(), because the intermediate "res" > is used to assign for "aq->mmap_size". > Yes indeed. I see that the above commit is merged in the SPI git tree. With that, Acked-by: Hari Prasath Gujulan Elango <hari.prasathge@microchip.com> Regards, Hari > Fixes: 3ccea1dedef3 ("spi: atmel-quadspi: Simpify resource lookup") > Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> > --- > drivers/spi/atmel-quadspi.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c > index 2b5c72176711..56dd8dcb86cb 100644 > --- a/drivers/spi/atmel-quadspi.c > +++ b/drivers/spi/atmel-quadspi.c > @@ -608,7 +608,8 @@ static int atmel_qspi_probe(struct platform_device *pdev) > } > > /* Map the AHB memory */ > - aq->mem = devm_platform_ioremap_resource_byname(pdev, "qspi_mmap"); > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi_mmap"); > + aq->mem = devm_ioremap_resource(&pdev->dev, res); > if (IS_ERR(aq->mem)) { > dev_err(&pdev->dev, "missing AHB memory\n"); > return PTR_ERR(aq->mem); > -- > 2.34.1 > >
diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index 2b5c72176711..56dd8dcb86cb 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -608,7 +608,8 @@ static int atmel_qspi_probe(struct platform_device *pdev) } /* Map the AHB memory */ - aq->mem = devm_platform_ioremap_resource_byname(pdev, "qspi_mmap"); + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi_mmap"); + aq->mem = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(aq->mem)) { dev_err(&pdev->dev, "missing AHB memory\n"); return PTR_ERR(aq->mem);
The second platform_get_resource_byname() can not be replaced with devm_platform_ioremap_resource_byname(), because the intermediate "res" is used to assign for "aq->mmap_size". Fixes: 3ccea1dedef3 ("spi: atmel-quadspi: Simpify resource lookup") Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> --- drivers/spi/atmel-quadspi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)