* [PATCH net-next v3 1/5] ethernet: wiznet: remove unnecessary check
2014-10-24 2:12 [PATCH net-next v3 0/5] cleanup on resource check Varka Bhadram
@ 2014-10-24 2:12 ` Varka Bhadram
2014-10-24 2:12 ` [PATCH net-next v3 2/5] ethernet: apm: xgene: " Varka Bhadram
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Varka Bhadram @ 2014-10-24 2:12 UTC (permalink / raw)
To: netdev; +Cc: davem, sergei.shtylyov, Varka Bhadram
devm_ioremap_resource checks platform_get_resource() return value.
We can remove the duplicate check here.
Signed-off-by: Varka Bhadram <varkab@cdac.in>
---
drivers/net/ethernet/wiznet/w5100.c | 6 ++----
drivers/net/ethernet/wiznet/w5300.c | 6 ++----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c
index 0f56b1c..70a930a 100644
--- a/drivers/net/ethernet/wiznet/w5100.c
+++ b/drivers/net/ethernet/wiznet/w5100.c
@@ -638,14 +638,12 @@ static int w5100_hw_probe(struct platform_device *pdev)
}
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);
if (IS_ERR(priv->base))
return PTR_ERR(priv->base);
+ mem_size = resource_size(mem);
+
spin_lock_init(&priv->reg_lock);
priv->indirect = mem_size < W5100_BUS_DIRECT_SIZE;
if (priv->indirect) {
diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c
index f961f14..7974b7d 100644
--- a/drivers/net/ethernet/wiznet/w5300.c
+++ b/drivers/net/ethernet/wiznet/w5300.c
@@ -558,14 +558,12 @@ static int w5300_hw_probe(struct platform_device *pdev)
}
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);
if (IS_ERR(priv->base))
return PTR_ERR(priv->base);
+ mem_size = resource_size(mem);
+
spin_lock_init(&priv->reg_lock);
priv->indirect = mem_size < W5300_BUS_DIRECT_SIZE;
if (priv->indirect) {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH net-next v3 2/5] ethernet: apm: xgene: remove unnecessary check
2014-10-24 2:12 [PATCH net-next v3 0/5] cleanup on resource check Varka Bhadram
2014-10-24 2:12 ` [PATCH net-next v3 1/5] ethernet: wiznet: remove unnecessary check Varka Bhadram
@ 2014-10-24 2:12 ` Varka Bhadram
2014-10-24 2:12 ` [PATCH net-next v3 3/5] ethernet: marvell: " Varka Bhadram
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Varka Bhadram @ 2014-10-24 2:12 UTC (permalink / raw)
To: netdev; +Cc: davem, sergei.shtylyov, Varka Bhadram
devm_ioremap_resource checks platform_get_resource() return value.
We can remove the duplicate check here.
Signed-off-by: Varka Bhadram <varkab@cdac.in>
---
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index 3c208cc..f226594 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -761,10 +761,6 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
ndev = pdata->ndev;
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);
if (IS_ERR(pdata->base_addr)) {
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");
- if (!res) {
- dev_err(dev, "Resource ring_csr not defined\n");
- return -ENODEV;
- }
pdata->ring_csr_addr = devm_ioremap_resource(dev, res);
if (IS_ERR(pdata->ring_csr_addr)) {
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");
- if (!res) {
- dev_err(dev, "Resource ring_cmd not defined\n");
- return -ENODEV;
- }
pdata->ring_cmd_addr = devm_ioremap_resource(dev, res);
if (IS_ERR(pdata->ring_cmd_addr)) {
dev_err(dev, "Unable to retrieve ENET Ring command region\n");
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH net-next v3 3/5] ethernet: marvell: remove unnecessary check
2014-10-24 2:12 [PATCH net-next v3 0/5] cleanup on resource check Varka Bhadram
2014-10-24 2:12 ` [PATCH net-next v3 1/5] ethernet: wiznet: remove unnecessary check Varka Bhadram
2014-10-24 2:12 ` [PATCH net-next v3 2/5] ethernet: apm: xgene: " Varka Bhadram
@ 2014-10-24 2:12 ` Varka Bhadram
2014-10-24 2:12 ` [PATCH net-next v3 4/5] ethernet: renesas: " Varka Bhadram
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Varka Bhadram @ 2014-10-24 2:12 UTC (permalink / raw)
To: netdev; +Cc: davem, sergei.shtylyov, Varka Bhadram
devm_ioremap_resource checks platform_get_resource() return value.
We can remove the duplicate check here.
Signed-off-by: Varka Bhadram <varkab@cdac.in>
---
drivers/net/ethernet/marvell/pxa168_eth.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index c3b209c..a378c92 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -1505,16 +1505,14 @@ static int pxa168_eth_probe(struct platform_device *pdev)
pep = netdev_priv(dev);
pep->dev = dev;
pep->clk = clk;
+
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (res == NULL) {
- err = -ENODEV;
- goto err_netdev;
- }
pep->base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(pep->base)) {
err = -ENOMEM;
goto err_netdev;
}
+
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
BUG_ON(!res);
dev->irq = res->start;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH net-next v3 4/5] ethernet: renesas: remove unnecessary check
2014-10-24 2:12 [PATCH net-next v3 0/5] cleanup on resource check Varka Bhadram
` (2 preceding siblings ...)
2014-10-24 2:12 ` [PATCH net-next v3 3/5] ethernet: marvell: " Varka Bhadram
@ 2014-10-24 2:12 ` Varka Bhadram
2014-10-24 2:12 ` [PATCH net-next v3 5/5] ethernet: samsung: sxgbe: " Varka Bhadram
2014-10-27 23:16 ` [PATCH net-next v3 0/5] cleanup on resource check David Miller
5 siblings, 0 replies; 7+ messages in thread
From: Varka Bhadram @ 2014-10-24 2:12 UTC (permalink / raw)
To: netdev; +Cc: davem, sergei.shtylyov, Varka Bhadram
devm_ioremap_resource checks platform_get_resource() return value.
We can remove the duplicate check here.
Signed-off-by: Varka Bhadram <varkab@cdac.in>
---
drivers/net/ethernet/renesas/sh_eth.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 60e9c2c..dbe8606 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -2769,10 +2769,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
/* get base addr */
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));
if (!ndev)
@@ -2781,8 +2777,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
pm_runtime_enable(&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;
if (devno < 0)
devno = 0;
@@ -2806,6 +2800,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
goto out_release;
}
+ ndev->base_addr = res->start;
+
spin_lock_init(&mdp->lock);
mdp->pdev = pdev;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH net-next v3 5/5] ethernet: samsung: sxgbe: remove unnecessary check
2014-10-24 2:12 [PATCH net-next v3 0/5] cleanup on resource check Varka Bhadram
` (3 preceding siblings ...)
2014-10-24 2:12 ` [PATCH net-next v3 4/5] ethernet: renesas: " Varka Bhadram
@ 2014-10-24 2:12 ` Varka Bhadram
2014-10-27 23:16 ` [PATCH net-next v3 0/5] cleanup on resource check David Miller
5 siblings, 0 replies; 7+ messages in thread
From: Varka Bhadram @ 2014-10-24 2:12 UTC (permalink / raw)
To: netdev; +Cc: davem, sergei.shtylyov, Varka Bhadram
devm_ioremap_resource checks platform_get_resource() return value.
We can remove the duplicate check here.
Signed-off-by: Varka Bhadram <varkab@cdac.in>
---
.../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
index b147d46..7fd6e27 100644
--- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
+++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
@@ -90,9 +90,6 @@ static int sxgbe_platform_probe(struct platform_device *pdev)
/* Get memory resource */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!res)
- goto err_out;
-
addr = devm_ioremap_resource(dev, res);
if (IS_ERR(addr))
return PTR_ERR(addr);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH net-next v3 0/5] cleanup on resource check
2014-10-24 2:12 [PATCH net-next v3 0/5] cleanup on resource check Varka Bhadram
` (4 preceding siblings ...)
2014-10-24 2:12 ` [PATCH net-next v3 5/5] ethernet: samsung: sxgbe: " Varka Bhadram
@ 2014-10-27 23:16 ` David Miller
5 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2014-10-27 23:16 UTC (permalink / raw)
To: varkabhadram; +Cc: netdev, sergei.shtylyov, varkab
From: Varka Bhadram <varkabhadram@gmail.com>
Date: Fri, 24 Oct 2014 07:42:05 +0530
> 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()
Series applied, thanks.
^ permalink raw reply [flat|nested] 7+ messages in thread