Commit 51fe084b authored by Simon Horman's avatar Simon Horman Committed by Jakub Kicinski
Browse files

net: stmmac: dwmac-anarion: Always return struct anarion_gmac * from anarion_config_dt() 



Always return struct anarion_gmac * from anarion_config_dt().
In the case where ctl_block was an error pointer it was being
returned directly. Which sparse flags as follows:

 .../dwmac-anarion.c:73:24: warning: incorrect type in return expression (different address spaces)
 .../dwmac-anarion.c:73:24:    expected struct anarion_gmac *
 .../dwmac-anarion.c:73:24:    got void [noderef] __iomem *[assigned] ctl_block

Avoid this by converting the error pointer to an error.
And then reversing the conversion.

As a side effect, the error can be used for logging purposes,
subjectively, leading to a minor cleanup.

No functional change intended.
Compile tested only.

Signed-off-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9f12541d

drivers/net/ethernet/stmicro/stmmac/dwmac-anarion.c

+3 −3
Original line number Diff line number Diff line
@@ -68,9 +68,9 @@ static struct anarion_gmac *anarion_config_dt(struct platform_device *pdev) 


	ctl_block = devm_platform_ioremap_resource(pdev, 1);

	if (IS_ERR(ctl_block)) {

		dev_err(&pdev->dev, "Cannot get reset region (%ld)!\n",

			PTR_ERR(ctl_block));

		return ctl_block;

		err = PTR_ERR(ctl_block);

		dev_err(&pdev->dev, "Cannot get reset region (%d)!\n", err);

		return ERR_PTR(err);

	}



	gmac = devm_kzalloc(&pdev->dev, sizeof(*gmac), GFP_KERNEL);