* [PATCH net-next 1/6] ethernet: wiznet: remove unnecessary check
2014-10-22 4:16 ` [PATCH net-next 0/6] cleanup on resource check Varka Bhadram
@ 2014-10-22 4:16 ` Varka Bhadram
2014-10-22 11:43 ` Sergei Shtylyov
2014-10-22 4:16 ` [PATCH net-next 2/6] " Varka Bhadram
` (4 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Varka Bhadram @ 2014-10-22 4:16 UTC (permalink / raw)
To: netdev; +Cc: 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 | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c
index 0f56b1c..bf195e3 100644
--- a/drivers/net/ethernet/wiznet/w5100.c
+++ b/drivers/net/ethernet/wiznet/w5100.c
@@ -638,8 +638,7 @@ 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);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH net-next 1/6] ethernet: wiznet: remove unnecessary check
2014-10-22 4:16 ` [PATCH net-next 1/6] ethernet: wiznet: remove unnecessary check Varka Bhadram
@ 2014-10-22 11:43 ` Sergei Shtylyov
2014-10-22 12:23 ` Varka Bhadram
0 siblings, 1 reply; 13+ messages in thread
From: Sergei Shtylyov @ 2014-10-22 11:43 UTC (permalink / raw)
To: Varka Bhadram, netdev; +Cc: Varka Bhadram
Hello.
On 10/22/2014 8:16 AM, Varka Bhadram wrote:
> 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 | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
> diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c
> index 0f56b1c..bf195e3 100644
> --- a/drivers/net/ethernet/wiznet/w5100.c
> +++ b/drivers/net/ethernet/wiznet/w5100.c
> @@ -638,8 +638,7 @@ 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);
This would cause a NULL dereference on resource_size() call if 'mem' is
NULL. You can't remove the NULL check because of that.
>
> priv->base = devm_ioremap_resource(&pdev->dev, mem);
>
WBR, Sergei
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH net-next 1/6] ethernet: wiznet: remove unnecessary check
2014-10-22 11:43 ` Sergei Shtylyov
@ 2014-10-22 12:23 ` Varka Bhadram
0 siblings, 0 replies; 13+ messages in thread
From: Varka Bhadram @ 2014-10-22 12:23 UTC (permalink / raw)
To: Sergei Shtylyov, netdev; +Cc: Varka Bhadram
On 10/22/2014 05:13 PM, Sergei Shtylyov wrote:
> Hello.
>
> On 10/22/2014 8:16 AM, Varka Bhadram wrote:
>
>> 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 | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>
>> diff --git a/drivers/net/ethernet/wiznet/w5100.c
>> b/drivers/net/ethernet/wiznet/w5100.c
>> index 0f56b1c..bf195e3 100644
>> --- a/drivers/net/ethernet/wiznet/w5100.c
>> +++ b/drivers/net/ethernet/wiznet/w5100.c
>> @@ -638,8 +638,7 @@ 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);
>
> This would cause a NULL dereference on resource_size() call if
> 'mem' is NULL. You can't remove the NULL check because of that.
>
Ok i will fix it . Thankx for the review.
>>
>> priv->base = devm_ioremap_resource(&pdev->dev, mem);
>>
>
> WBR, Sergei
>
--
Regards,
Varka Bhadram.
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH net-next 2/6] ethernet: wiznet: remove unnecessary check
2014-10-22 4:16 ` [PATCH net-next 0/6] cleanup on resource check Varka Bhadram
2014-10-22 4:16 ` [PATCH net-next 1/6] ethernet: wiznet: remove unnecessary check Varka Bhadram
@ 2014-10-22 4:16 ` Varka Bhadram
2014-10-22 11:44 ` Sergei Shtylyov
2014-10-22 4:16 ` [PATCH net-next 3/6] ethernet: apm: xgene: " Varka Bhadram
` (3 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Varka Bhadram @ 2014-10-22 4:16 UTC (permalink / raw)
To: netdev; +Cc: 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/w5300.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c
index f961f14..315d090 100644
--- a/drivers/net/ethernet/wiznet/w5300.c
+++ b/drivers/net/ethernet/wiznet/w5300.c
@@ -558,8 +558,7 @@ 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);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH net-next 2/6] ethernet: wiznet: remove unnecessary check
2014-10-22 4:16 ` [PATCH net-next 2/6] " Varka Bhadram
@ 2014-10-22 11:44 ` Sergei Shtylyov
2014-10-22 12:24 ` Varka Bhadram
0 siblings, 1 reply; 13+ messages in thread
From: Sergei Shtylyov @ 2014-10-22 11:44 UTC (permalink / raw)
To: Varka Bhadram, netdev; +Cc: Varka Bhadram
On 10/22/2014 8:16 AM, Varka Bhadram wrote:
> 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/w5300.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
> diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c
> index f961f14..315d090 100644
> --- a/drivers/net/ethernet/wiznet/w5300.c
> +++ b/drivers/net/ethernet/wiznet/w5300.c
> @@ -558,8 +558,7 @@ 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);
Same problem as in the patch #1
>
> priv->base = devm_ioremap_resource(&pdev->dev, mem);
>
WBR, Sergei
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH net-next 2/6] ethernet: wiznet: remove unnecessary check
2014-10-22 11:44 ` Sergei Shtylyov
@ 2014-10-22 12:24 ` Varka Bhadram
0 siblings, 0 replies; 13+ messages in thread
From: Varka Bhadram @ 2014-10-22 12:24 UTC (permalink / raw)
To: Sergei Shtylyov, netdev; +Cc: Varka Bhadram
On 10/22/2014 05:14 PM, Sergei Shtylyov wrote:
> On 10/22/2014 8:16 AM, Varka Bhadram wrote:
>
>> 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/w5300.c | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>
>> diff --git a/drivers/net/ethernet/wiznet/w5300.c
>> b/drivers/net/ethernet/wiznet/w5300.c
>> index f961f14..315d090 100644
>> --- a/drivers/net/ethernet/wiznet/w5300.c
>> +++ b/drivers/net/ethernet/wiznet/w5300.c
>> @@ -558,8 +558,7 @@ 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);
>
> Same problem as in the patch #1
>
I will fix it . Thanks
>>
>> priv->base = devm_ioremap_resource(&pdev->dev, mem);
>>
>
> WBR, Sergei
>
--
Regards,
Varka Bhadram.
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH net-next 3/6] ethernet: apm: xgene: remove unnecessary check
2014-10-22 4:16 ` [PATCH net-next 0/6] cleanup on resource check Varka Bhadram
2014-10-22 4:16 ` [PATCH net-next 1/6] ethernet: wiznet: remove unnecessary check Varka Bhadram
2014-10-22 4:16 ` [PATCH net-next 2/6] " Varka Bhadram
@ 2014-10-22 4:16 ` Varka Bhadram
2014-10-22 4:16 ` [PATCH net-next 4/6] ethernet: marvell: " Varka Bhadram
` (2 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Varka Bhadram @ 2014-10-22 4:16 UTC (permalink / raw)
To: netdev; +Cc: 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] 13+ messages in thread* [PATCH net-next 4/6] ethernet: marvell: remove unnecessary check
2014-10-22 4:16 ` [PATCH net-next 0/6] cleanup on resource check Varka Bhadram
` (2 preceding siblings ...)
2014-10-22 4:16 ` [PATCH net-next 3/6] ethernet: apm: xgene: " Varka Bhadram
@ 2014-10-22 4:16 ` Varka Bhadram
2014-10-22 4:16 ` [PATCH net-next 5/6] ethernet: renesas: " Varka Bhadram
2014-10-22 4:16 ` [PATCH net-next 6/6] ethernet: samsung: sxgbe: " Varka Bhadram
5 siblings, 0 replies; 13+ messages in thread
From: Varka Bhadram @ 2014-10-22 4:16 UTC (permalink / raw)
To: netdev; +Cc: 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] 13+ messages in thread* [PATCH net-next 5/6] ethernet: renesas: remove unnecessary check
2014-10-22 4:16 ` [PATCH net-next 0/6] cleanup on resource check Varka Bhadram
` (3 preceding siblings ...)
2014-10-22 4:16 ` [PATCH net-next 4/6] ethernet: marvell: " Varka Bhadram
@ 2014-10-22 4:16 ` Varka Bhadram
2014-10-22 11:47 ` Sergei Shtylyov
2014-10-22 4:16 ` [PATCH net-next 6/6] ethernet: samsung: sxgbe: " Varka Bhadram
5 siblings, 1 reply; 13+ messages in thread
From: Varka Bhadram @ 2014-10-22 4:16 UTC (permalink / raw)
To: netdev; +Cc: 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 | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 60e9c2c..d824ba5 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)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH net-next 5/6] ethernet: renesas: remove unnecessary check
2014-10-22 4:16 ` [PATCH net-next 5/6] ethernet: renesas: " Varka Bhadram
@ 2014-10-22 11:47 ` Sergei Shtylyov
2014-10-22 12:22 ` Varka Bhadram
0 siblings, 1 reply; 13+ messages in thread
From: Sergei Shtylyov @ 2014-10-22 11:47 UTC (permalink / raw)
To: Varka Bhadram, netdev; +Cc: Varka Bhadram
On 10/22/2014 8:16 AM, Varka Bhadram wrote:
> 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 | 4 ----
> 1 file changed, 4 deletions(-)
> diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
> index 60e9c2c..d824ba5 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;
> - }
The driver dereferences 'res' further on, so you can't remove this check.
WBR, Sergei
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH net-next 5/6] ethernet: renesas: remove unnecessary check
2014-10-22 11:47 ` Sergei Shtylyov
@ 2014-10-22 12:22 ` Varka Bhadram
0 siblings, 0 replies; 13+ messages in thread
From: Varka Bhadram @ 2014-10-22 12:22 UTC (permalink / raw)
To: Sergei Shtylyov, netdev; +Cc: Varka Bhadram
On 10/22/2014 05:17 PM, Sergei Shtylyov wrote:
> On 10/22/2014 8:16 AM, Varka Bhadram wrote:
>
>> 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 | 4 ----
>> 1 file changed, 4 deletions(-)
>
>> diff --git a/drivers/net/ethernet/renesas/sh_eth.c
>> b/drivers/net/ethernet/renesas/sh_eth.c
>> index 60e9c2c..d824ba5 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;
>> - }
>
> The driver dereferences 'res' further on, so you can't remove this
> check.
>
Yes its my mistake . I will fix it . Thankx
> WBR, Sergei
>
--
Regards,
Varka Bhadram.
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH net-next 6/6] ethernet: samsung: sxgbe: remove unnecessary check
2014-10-22 4:16 ` [PATCH net-next 0/6] cleanup on resource check Varka Bhadram
` (4 preceding siblings ...)
2014-10-22 4:16 ` [PATCH net-next 5/6] ethernet: renesas: " Varka Bhadram
@ 2014-10-22 4:16 ` Varka Bhadram
5 siblings, 0 replies; 13+ messages in thread
From: Varka Bhadram @ 2014-10-22 4:16 UTC (permalink / raw)
To: netdev; +Cc: 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] 13+ messages in thread