| Message ID | 20210609141744.3205628-1-yangyingliang@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | [net-next] net: davinci_emac: Use devm_platform_get_and_ioremap_resource() | expand |
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Wed, 9 Jun 2021 22:17:44 +0800 you wrote: > Use devm_platform_get_and_ioremap_resource() to simplify > code and avoid a null-ptr-deref by checking 'res' in it. > > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> > --- > drivers/net/ethernet/ti/davinci_emac.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) Here is the summary with links: - [net-next] net: davinci_emac: Use devm_platform_get_and_ioremap_resource() https://git.kernel.org/netdev/net-next/c/0699073951e3 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/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index f9417b44cae8..c674e34b6839 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c @@ -1814,13 +1814,12 @@ static int davinci_emac_probe(struct platform_device *pdev) priv->bus_freq_mhz = (u32)(emac_bus_frequency / 1000000); /* Get EMAC platform data */ - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - priv->emac_base_phys = res->start + pdata->ctrl_reg_offset; - priv->remap_addr = devm_ioremap_resource(&pdev->dev, res); + priv->remap_addr = devm_platform_get_and_ioremap_resource(pdev, 0, &res); if (IS_ERR(priv->remap_addr)) { rc = PTR_ERR(priv->remap_addr); goto no_pdata; } + priv->emac_base_phys = res->start + pdata->ctrl_reg_offset; res_ctrl = platform_get_resource(pdev, IORESOURCE_MEM, 1); if (res_ctrl) {
Use devm_platform_get_and_ioremap_resource() to simplify code and avoid a null-ptr-deref by checking 'res' in it. Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- drivers/net/ethernet/ti/davinci_emac.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)