* [patch -next] net: eth: xgene: devm_ioremap() returns NULL on error
@ 2015-01-08 10:52 Dan Carpenter
2015-01-09 22:56 ` Iyappan Subramanian
2015-01-12 20:40 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2015-01-08 10:52 UTC (permalink / raw)
To: Iyappan Subramanian, Feng Kan
Cc: Keyur Chudgar, Grant Likely, Rob Herring, netdev, kernel-janitors
devm_ioremap() returns NULL on failure, it doesn't return an ERR_PTR.
Fixes: de7b5b3d790a ('net: eth: xgene: change APM X-Gene SoC platform ethernet to support ACPI')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index 1e56bf3..02add38 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -804,9 +804,9 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
return -ENODEV;
}
pdata->base_addr = devm_ioremap(dev, res->start, resource_size(res));
- if (IS_ERR(pdata->base_addr)) {
+ if (!pdata->base_addr) {
dev_err(dev, "Unable to retrieve ENET Port CSR region\n");
- return PTR_ERR(pdata->base_addr);
+ return -ENOMEM;
}
res = platform_get_resource(pdev, IORESOURCE_MEM, RES_RING_CSR);
@@ -816,9 +816,9 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
}
pdata->ring_csr_addr = devm_ioremap(dev, res->start,
resource_size(res));
- if (IS_ERR(pdata->ring_csr_addr)) {
+ if (!pdata->ring_csr_addr) {
dev_err(dev, "Unable to retrieve ENET Ring CSR region\n");
- return PTR_ERR(pdata->ring_csr_addr);
+ return -ENOMEM;
}
res = platform_get_resource(pdev, IORESOURCE_MEM, RES_RING_CMD);
@@ -828,9 +828,9 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
}
pdata->ring_cmd_addr = devm_ioremap(dev, res->start,
resource_size(res));
- if (IS_ERR(pdata->ring_cmd_addr)) {
+ if (!pdata->ring_cmd_addr) {
dev_err(dev, "Unable to retrieve ENET Ring command region\n");
- return PTR_ERR(pdata->ring_cmd_addr);
+ return -ENOMEM;
}
ret = platform_get_irq(pdev, 0);
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [patch -next] net: eth: xgene: devm_ioremap() returns NULL on error
2015-01-08 10:52 [patch -next] net: eth: xgene: devm_ioremap() returns NULL on error Dan Carpenter
@ 2015-01-09 22:56 ` Iyappan Subramanian
2015-01-12 20:40 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Iyappan Subramanian @ 2015-01-09 22:56 UTC (permalink / raw)
To: Dan Carpenter
Cc: Feng Kan, Keyur Chudgar, Grant Likely, Rob Herring, netdev,
kernel-janitors
On Thu, Jan 8, 2015 at 2:52 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> devm_ioremap() returns NULL on failure, it doesn't return an ERR_PTR.
>
> Fixes: de7b5b3d790a ('net: eth: xgene: change APM X-Gene SoC platform ethernet to support ACPI')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
> index 1e56bf3..02add38 100644
> --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
> +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
> @@ -804,9 +804,9 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
> return -ENODEV;
> }
> pdata->base_addr = devm_ioremap(dev, res->start, resource_size(res));
> - if (IS_ERR(pdata->base_addr)) {
> + if (!pdata->base_addr) {
> dev_err(dev, "Unable to retrieve ENET Port CSR region\n");
> - return PTR_ERR(pdata->base_addr);
> + return -ENOMEM;
> }
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, RES_RING_CSR);
> @@ -816,9 +816,9 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
> }
> pdata->ring_csr_addr = devm_ioremap(dev, res->start,
> resource_size(res));
> - if (IS_ERR(pdata->ring_csr_addr)) {
> + if (!pdata->ring_csr_addr) {
> dev_err(dev, "Unable to retrieve ENET Ring CSR region\n");
> - return PTR_ERR(pdata->ring_csr_addr);
> + return -ENOMEM;
> }
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, RES_RING_CMD);
> @@ -828,9 +828,9 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
> }
> pdata->ring_cmd_addr = devm_ioremap(dev, res->start,
> resource_size(res));
> - if (IS_ERR(pdata->ring_cmd_addr)) {
> + if (!pdata->ring_cmd_addr) {
> dev_err(dev, "Unable to retrieve ENET Ring command region\n");
> - return PTR_ERR(pdata->ring_cmd_addr);
> + return -ENOMEM;
> }
>
> ret = platform_get_irq(pdev, 0);
Acked-by: Iyappan Subramanian <isubramanian@apm.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [patch -next] net: eth: xgene: devm_ioremap() returns NULL on error
2015-01-08 10:52 [patch -next] net: eth: xgene: devm_ioremap() returns NULL on error Dan Carpenter
2015-01-09 22:56 ` Iyappan Subramanian
@ 2015-01-12 20:40 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2015-01-12 20:40 UTC (permalink / raw)
To: dan.carpenter
Cc: isubramanian, fkan, kchudgar, grant.likely, robh+dt, netdev,
kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 8 Jan 2015 13:52:12 +0300
> devm_ioremap() returns NULL on failure, it doesn't return an ERR_PTR.
>
> Fixes: de7b5b3d790a ('net: eth: xgene: change APM X-Gene SoC platform ethernet to support ACPI')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-12 20:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-08 10:52 [patch -next] net: eth: xgene: devm_ioremap() returns NULL on error Dan Carpenter
2015-01-09 22:56 ` Iyappan Subramanian
2015-01-12 20:40 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox