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>
This commit is contained in:
parent
97f4be6017
commit
eb612fa013
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue