diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2013-06-17 11:07:44 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-19 11:10:30 +0200 |
| commit | f670758f5b829169562e1016a72af0c59360a541 (patch) | |
| tree | 0eca8d247dd2ba2debca4cd5f062f3608b39b539 /arch/sparc | |
| parent | sparc64 address-congruence property (diff) | |
| download | linux-f670758f5b829169562e1016a72af0c59360a541.tar.xz linux-f670758f5b829169562e1016a72af0c59360a541.zip | |
sparc,leon: 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().
While at it, also remove the error message as devm_ioremap_resource()
also prints similar error message.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
CC: sparclinux@vger.kernel.org
CC: "David S. Miller" <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/leon_pci_grpci1.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/sparc/kernel/leon_pci_grpci1.c b/arch/sparc/kernel/leon_pci_grpci1.c index 7739a54315e2..6df26e37f879 100644 --- a/arch/sparc/kernel/leon_pci_grpci1.c +++ b/arch/sparc/kernel/leon_pci_grpci1.c @@ -536,11 +536,9 @@ static int grpci1_of_probe(struct platform_device *ofdev) /* find device register base address */ res = platform_get_resource(ofdev, IORESOURCE_MEM, 0); - regs = devm_request_and_ioremap(&ofdev->dev, res); - if (!regs) { - dev_err(&ofdev->dev, "io-regs mapping failed\n"); - return -EADDRNOTAVAIL; - } + regs = devm_ioremap_resource(&ofdev->dev, res); + if (IS_ERR(regs)) + return PTR_ERR(regs); /* * check that we're in Host Slot and that we can act as a Host Bridge |