diff options
| author |   Tushar Behera <tushar.behera@linaro.org> | 2013-06-10 17:05:06 +0530 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-06-12 02:22:35 -0700 |
| commit | eed5d29d7818cc7a84e60123555cae154e5b4a73 (patch) | |
| tree | 331145a1b7612d8df38a60b51190c36ebaa301f1 /drivers/net/ethernet/xilinx/xilinx_emaclite.c | |
| parent | net: fec: Convert to use devm_ioremap_resource (diff) | |
| download | linux-dev-eed5d29d7818cc7a84e60123555cae154e5b4a73.tar.xz linux-dev-eed5d29d7818cc7a84e60123555cae154e5b4a73.zip | |
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/xilinx_emaclite.c')
| -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) ndev->irq = res->start; res = platform_get_resource(ofdev, IORESOURCE_MEM, 0); - lp->base_addr = devm_request_and_ioremap(&ofdev->dev, res); - if (!lp->base_addr) + lp->base_addr = devm_ioremap_resource(&ofdev->dev, res); + if (IS_ERR(lp->base_addr)) { + rc = PTR_ERR(lp->base_addr); goto error; + } ndev->mem_start = res->start; ndev->mem_end = res->end; |