Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c2db1c6 authored by Thierry Reding's avatar Thierry Reding Committed by Greg Kroah-Hartman
Browse files

mfd: 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: default avatarThierry Reding <thierry.reding@avionic-design.de>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d65e8e4a

drivers/mfd/intel_msic.c

+4 −5
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 * published by the Free Software Foundation.

 */



#include <linux/err.h>

#include <linux/gpio.h>

#include <linux/io.h>

#include <linux/module.h>
@@ -424,11 +425,9 @@ static int intel_msic_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	msic->irq_base = devm_request_and_ioremap(&pdev->dev, res);

	if (!msic->irq_base) {

		dev_err(&pdev->dev, "failed to map SRAM memory\n");

		return -ENOMEM;

	}

	msic->irq_base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(msic->irq_base))

		return PTR_ERR(msic->irq_base);



	platform_set_drvdata(pdev, msic);