OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'unnecessary_resource_check' 

Varka Bhadram says:

====================
cleanup on resource check

This series removes the duplication of sanity check for
platform_get_resource() return resource. It will be checked
with devm_ioremap_resource()

changes since v2:
	- Merge #1 and #2 patches into single patch
	- remove the comment

changes since v1:
	- remove NULL dereference on resource_size()
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2014-10-27 19:16:14 -04:00
parent 958501163d aaa14fe396
commit cf7b200386
6 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/ethernet/apm/xgene/xgene_enet_main.c
View File

@ -761,10 +761,6 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
ndev = pdata->ndev; ndev = pdata->ndev;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "enet_csr"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "enet_csr");
if (!res) {
dev_err(dev, "Resource enet_csr not defined\n");
return -ENODEV;
}
pdata->base_addr = devm_ioremap_resource(dev, res); pdata->base_addr = devm_ioremap_resource(dev, res);
if (IS_ERR(pdata->base_addr)) { if (IS_ERR(pdata->base_addr)) {
dev_err(dev, "Unable to retrieve ENET Port CSR region\n"); dev_err(dev, "Unable to retrieve ENET Port CSR region\n");
@ -772,10 +768,6 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
} }
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ring_csr"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ring_csr");
if (!res) {
dev_err(dev, "Resource ring_csr not defined\n");
return -ENODEV;
}
pdata->ring_csr_addr = devm_ioremap_resource(dev, res); pdata->ring_csr_addr = devm_ioremap_resource(dev, res);
if (IS_ERR(pdata->ring_csr_addr)) { if (IS_ERR(pdata->ring_csr_addr)) {
dev_err(dev, "Unable to retrieve ENET Ring CSR region\n"); dev_err(dev, "Unable to retrieve ENET Ring CSR region\n");
@ -783,10 +775,6 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
} }
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ring_cmd"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ring_cmd");
if (!res) {
dev_err(dev, "Resource ring_cmd not defined\n");
return -ENODEV;
}
pdata->ring_cmd_addr = devm_ioremap_resource(dev, res); pdata->ring_cmd_addr = devm_ioremap_resource(dev, res);
if (IS_ERR(pdata->ring_cmd_addr)) { if (IS_ERR(pdata->ring_cmd_addr)) {
dev_err(dev, "Unable to retrieve ENET Ring command region\n"); dev_err(dev, "Unable to retrieve ENET Ring command region\n");

6
drivers/net/ethernet/marvell/pxa168_eth.c
View File

@ -1450,16 +1450,14 @@ static int pxa168_eth_probe(struct platform_device *pdev)
pep = netdev_priv(dev); pep = netdev_priv(dev);
pep->dev = dev; pep->dev = dev;
pep->clk = clk; pep->clk = clk;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (res == NULL) {
err = -ENODEV;
goto err_netdev;
}
pep->base = devm_ioremap_resource(&pdev->dev, res); pep->base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(pep->base)) { if (IS_ERR(pep->base)) {
err = -ENOMEM; err = -ENOMEM;
goto err_netdev; goto err_netdev;
} }
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
BUG_ON(!res); BUG_ON(!res);
dev->irq = res->start; dev->irq = res->start;

8
drivers/net/ethernet/renesas/sh_eth.c
View File

@ -2769,10 +2769,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
/* get base addr */ /* get base addr */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (unlikely(res == NULL)) {
dev_err(&pdev->dev, "invalid resource\n");
return -EINVAL;
}
ndev = alloc_etherdev(sizeof(struct sh_eth_private)); ndev = alloc_etherdev(sizeof(struct sh_eth_private));
if (!ndev) if (!ndev)
@ -2781,8 +2777,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
pm_runtime_get_sync(&pdev->dev); pm_runtime_get_sync(&pdev->dev);
/* The sh Ether-specific entries in the device structure. */
ndev->base_addr = res->start;
devno = pdev->id; devno = pdev->id;
if (devno < 0) if (devno < 0)
devno = 0; devno = 0;
@ -2806,6 +2800,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
goto out_release; goto out_release;
} }
ndev->base_addr = res->start;
spin_lock_init(&mdp->lock); spin_lock_init(&mdp->lock);
mdp->pdev = pdev; mdp->pdev = pdev;

3
drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
View File

@ -90,9 +90,6 @@ static int sxgbe_platform_probe(struct platform_device *pdev)
/* Get memory resource */ /* Get memory resource */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res)
goto err_out;
addr = devm_ioremap_resource(dev, res); addr = devm_ioremap_resource(dev, res);
if (IS_ERR(addr)) if (IS_ERR(addr))
return PTR_ERR(addr); return PTR_ERR(addr);

6
drivers/net/ethernet/wiznet/w5100.c
View File

@ -638,14 +638,12 @@ static int w5100_hw_probe(struct platform_device *pdev)
} }
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem)
return -ENXIO;
mem_size = resource_size(mem);
priv->base = devm_ioremap_resource(&pdev->dev, mem); priv->base = devm_ioremap_resource(&pdev->dev, mem);
if (IS_ERR(priv->base)) if (IS_ERR(priv->base))
return PTR_ERR(priv->base); return PTR_ERR(priv->base);
mem_size = resource_size(mem);
spin_lock_init(&priv->reg_lock); spin_lock_init(&priv->reg_lock);
priv->indirect = mem_size < W5100_BUS_DIRECT_SIZE; priv->indirect = mem_size < W5100_BUS_DIRECT_SIZE;
if (priv->indirect) { if (priv->indirect) {

6
drivers/net/ethernet/wiznet/w5300.c
View File

@ -558,14 +558,12 @@ static int w5300_hw_probe(struct platform_device *pdev)
} }
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem)
return -ENXIO;
mem_size = resource_size(mem);
priv->base = devm_ioremap_resource(&pdev->dev, mem); priv->base = devm_ioremap_resource(&pdev->dev, mem);
if (IS_ERR(priv->base)) if (IS_ERR(priv->base))
return PTR_ERR(priv->base); return PTR_ERR(priv->base);
mem_size = resource_size(mem);
spin_lock_init(&priv->reg_lock); spin_lock_init(&priv->reg_lock);
priv->indirect = mem_size < W5300_BUS_DIRECT_SIZE; priv->indirect = mem_size < W5300_BUS_DIRECT_SIZE;
if (priv->indirect) { if (priv->indirect) {