Commit f670758f authored Jun 17, 2013 by Tushar Behera Committed by David S. Miller Jun 19, 2013

sparc,leon: Convert to use devm_ioremap_resource



Commit 75096579 ("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>

parent 771a37ff

arch/sparc/kernel/leon_pci_grpci1.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -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