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

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

mmc: 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: Chris Ball <cjb@laptop.org>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6c2db1c6

drivers/mmc/host/dw_mmc-pltfm.c

+4 −3
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 * (at your option) any later version.

 */



#include <linux/err.h>

#include <linux/interrupt.h>

#include <linux/module.h>

#include <linux/io.h>
@@ -46,9 +47,9 @@ int dw_mci_pltfm_register(struct platform_device *pdev, 
	host->dev = &pdev->dev;

	host->irq_flags = 0;

	host->pdata = pdev->dev.platform_data;

	host->regs = devm_request_and_ioremap(&pdev->dev, regs);

	if (!host->regs)

		return -ENOMEM;

	host->regs = devm_ioremap_resource(&pdev->dev, regs);

	if (IS_ERR(host->regs))

		return PTR_ERR(host->regs);



	if (drv_data && drv_data->init) {

		ret = drv_data->init(host);

drivers/mmc/host/mxs-mmc.c

+3 −3
Original line number Diff line number Diff line
@@ -614,9 +614,9 @@ static int mxs_mmc_probe(struct platform_device *pdev) 
	host = mmc_priv(mmc);

	ssp = &host->ssp;

	ssp->dev = &pdev->dev;

	ssp->base = devm_request_and_ioremap(&pdev->dev, iores);

	if (!ssp->base) {

		ret = -EADDRNOTAVAIL;

	ssp->base = devm_ioremap_resource(&pdev->dev, iores);

	if (IS_ERR(ssp->base)) {

		ret = PTR_ERR(ssp->base);

		goto out_mmc_free;

	}

drivers/mmc/host/sdhci-s3c.c

+3 −4
Original line number Diff line number Diff line
@@ -651,10 +651,9 @@ static int sdhci_s3c_probe(struct platform_device *pdev) 
#endif



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	host->ioaddr = devm_request_and_ioremap(&pdev->dev, res);

	if (!host->ioaddr) {

		dev_err(dev, "failed to map registers\n");

		ret = -ENXIO;

	host->ioaddr = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(host->ioaddr)) {

		ret = PTR_ERR(host->ioaddr);

		goto err_req_regs;

	}