diff options
author | Tushar Behera <tushar.behera@linaro.org> | 2013-06-10 07:35:06 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-06-12 05:22:35 -0400 |
commit | eed5d29d7818cc7a84e60123555cae154e5b4a73 (patch) | |
tree | 331145a1b7612d8df38a60b51190c36ebaa301f1 /drivers/net/ethernet/xilinx | |
parent | 941e173a538c58f7f60e3f70ab0e35d51563405b (diff) |
net: emaclite: Convert to use devm_ioremap_resource
Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()")
introduced devm_ioremap_resource() and deprecated the use of
devm_request_and_ioremap().
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
CC: netdev@vger.kernel.org
CC: "David S. Miller" <davem@davemloft.net>
CC: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/xilinx')
-rw-r--r-- | drivers/net/ethernet/xilinx/xilinx_emaclite.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c index 1cd131bde680..fd4dbdae5331 100644 --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c | |||
@@ -1159,9 +1159,11 @@ static int xemaclite_of_probe(struct platform_device *ofdev) | |||
1159 | ndev->irq = res->start; | 1159 | ndev->irq = res->start; |
1160 | 1160 | ||
1161 | res = platform_get_resource(ofdev, IORESOURCE_MEM, 0); | 1161 | res = platform_get_resource(ofdev, IORESOURCE_MEM, 0); |
1162 | lp->base_addr = devm_request_and_ioremap(&ofdev->dev, res); | 1162 | lp->base_addr = devm_ioremap_resource(&ofdev->dev, res); |
1163 | if (!lp->base_addr) | 1163 | if (IS_ERR(lp->base_addr)) { |
1164 | rc = PTR_ERR(lp->base_addr); | ||
1164 | goto error; | 1165 | goto error; |
1166 | } | ||
1165 | 1167 | ||
1166 | ndev->mem_start = res->start; | 1168 | ndev->mem_start = res->start; |
1167 | ndev->mem_end = res->end; | 1169 | ndev->mem_end = res->end; |