Skip to contentSkip to conversation

net: eth: xgene: devm_ioremap() returns NULL on error

PATCH Applied Dan Carpenter 3 participants 3 messages Jan 8, 2015 – Jan 12, 2015

Subsystems (4)
Networking Network drivers Kernel janitors Applied micro (apm) x-gene SoC Ethernet driver
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 net: eth: xgene: devm_ioremap() returns NULL on error

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 <[email protected]>
drivers/net/ethernet/apm/xgene/xgene_enet_main.c +6 -6
index 1e56bf3..02add38 100644
@@ -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 on v1 1/1
#1 lore raw
Quoted 35 lines · Dan Carpenter

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 <[email protected]>
drivers/net/ethernet/apm/xgene/xgene_enet_main.c +4 -4
index 1e56bf3..02add38 100644
@@ -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)
        }

drivers/net/ethernet/apm/xgene/xgene_enet_main.c static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata) · line 836

Quoted 10 lines
drivers/net/ethernet/apm/xgene/xgene_enet_main.c +2 -2
        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 <[email protected]>