2021-03-18 13:50:08

by Wei Yongjun

Subject: [PATCH -next] phy: sparx5_serdes: Fix return value check in sparx5_serdes_probe()

From: Wei Yongjun <[email protected]>

In case of error, the function devm_ioremap() returns NULL
pointer not ERR_PTR(). The IS_ERR() test in the return value
check should be replaced with NULL test.

Fixes: 2ff8a1eeb5aa ("phy: Add Sparx5 ethernet serdes PHY driver")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/phy/microchip/sparx5_serdes.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/phy/microchip/sparx5_serdes.c b/drivers/phy/microchip/sparx5_serdes.c
index 06bcf0c166cf..dd854d825000 100644
--- a/drivers/phy/microchip/sparx5_serdes.c
+++ b/drivers/phy/microchip/sparx5_serdes.c
@@ -2438,10 +2438,10 @@ static int sparx5_serdes_probe(struct platform_device *pdev)

iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
iomem = devm_ioremap(priv->dev, iores->start, iores->end - iores->start + 1);
- if (IS_ERR(iomem)) {
+ if (!iomem) {
dev_err(priv->dev, "Unable to get serdes registers: %s\n",
iores->name);
- return PTR_ERR(iomem);
+ return -ENOMEM;
}
for (idx = 0; idx < ARRAY_SIZE(sparx5_serdes_iomap); idx++) {
struct sparx5_serdes_io_resource *iomap = &sparx5_serdes_iomap[idx];

2021-03-18 14:13:13

by Alexandre Belloni

Subject: Re: [PATCH -next] phy: sparx5_serdes: Fix return value check in sparx5_serdes_probe()

Hello,

On 18/03/2021 13:56:47+0000, 'w00385741 wrote:
> From: Wei Yongjun <[email protected]>
>
> In case of error, the function devm_ioremap() returns NULL
> pointer not ERR_PTR(). The IS_ERR() test in the return value
> check should be replaced with NULL test.
>
> Fixes: 2ff8a1eeb5aa ("phy: Add Sparx5 ethernet serdes PHY driver")
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Wei Yongjun <[email protected]>
> ---
> drivers/phy/microchip/sparx5_serdes.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/phy/microchip/sparx5_serdes.c b/drivers/phy/microchip/sparx5_serdes.c
> index 06bcf0c166cf..dd854d825000 100644
> --- a/drivers/phy/microchip/sparx5_serdes.c
> +++ b/drivers/phy/microchip/sparx5_serdes.c
> @@ -2438,10 +2438,10 @@ static int sparx5_serdes_probe(struct platform_device *pdev)
>
> iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> iomem = devm_ioremap(priv->dev, iores->start, iores->end - iores->start + 1);
> - if (IS_ERR(iomem)) {
> + if (!iomem) {
> dev_err(priv->dev, "Unable to get serdes registers: %s\n",
> iores->name);
> - return PTR_ERR(iomem);
> + return -ENOMEM;
> }

A better fix would use devm_platform_ioremap_resource and get rid of the
error messages

> for (idx = 0; idx < ARRAY_SIZE(sparx5_serdes_iomap); idx++) {
> struct sparx5_serdes_io_resource *iomap = &sparx5_serdes_iomap[idx];
>

--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com