Message ID | 20210605122515.2476263-1-yangyingliang@huawei.com |
---|---|
State | New |
Headers | show |
Series | [net-next,v2] net: ethernet: ixp4xx_eth: Use devm_platform_get_and_ioremap_resource() | expand |
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Sat, 5 Jun 2021 20:25:15 +0800 you wrote: > Use devm_platform_get_and_ioremap_resource() to simplify > code. > > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> > --- > v2: > remove 'res' > > [...] Here is the summary with links: - [net-next,v2] net: ethernet: ixp4xx_eth: Use devm_platform_get_and_ioremap_resource() https://git.kernel.org/netdev/net-next/c/ec89c2b55dc7 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c index 1ecceeb9700d..85c66af9e56d 100644 --- a/drivers/net/ethernet/xscale/ixp4xx_eth.c +++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c @@ -1425,7 +1425,6 @@ static int ixp4xx_eth_probe(struct platform_device *pdev) struct device_node *np = dev->of_node; struct eth_plat_info *plat; struct net_device *ndev; - struct resource *res; struct port *port; int err; @@ -1482,10 +1481,7 @@ static int ixp4xx_eth_probe(struct platform_device *pdev) port->id = plat->npe; /* Get the port resource and remap */ - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) - return -ENODEV; - port->regs = devm_ioremap_resource(dev, res); + port->regs = devm_platform_get_and_ioremap_resource(pdev, 0, NULL); if (IS_ERR(port->regs)) return PTR_ERR(port->regs);
Use devm_platform_get_and_ioremap_resource() to simplify code. Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- v2: remove 'res' --- drivers/net/ethernet/xscale/ixp4xx_eth.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)