Commit eb612fa0 authored Jan 21, 2013 by Thierry Reding Committed by Greg Kroah-Hartman Jan 22, 2013

serial: Convert to devm_ioremap_resource()

Convert all uses of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() which provides more consistent error handling.

devm_ioremap_resource() provides its own error messages so all explicit
error messages can be removed from the failure code paths.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 97f4be60

drivers/tty/serial/sccnxp.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		#define SUPPORT_SYSRQ
		#endif

		#include <linux/err.h>
		#include <linux/module.h>
		#include <linux/device.h>
		#include <linux/console.h>
		@@ -875,10 +876,9 @@ static int sccnxp_probe(struct platform_device *pdev)
		goto err_out;
		}

		membase = devm_request_and_ioremap(&pdev->dev, res);
		if (!membase) {
		dev_err(&pdev->dev, "Failed to ioremap\n");
		ret = -EIO;
		membase = devm_ioremap_resource(&pdev->dev, res);
		if (IS_ERR(membase)) {
		ret = PTR_ERR(membase);
		goto err_out;
		}