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

Commit 43960b47 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Linus Walleij
Browse files

gpio: generic: modernize remapping 



Replace devm_request_mem_region / devm_ioremap with devm_ioremap_resource.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent cf3f2a2c

drivers/gpio/gpio-generic.c

+3 −11
Original line number Original line Diff line number Diff line
@@ -582,9 +582,7 @@ static void __iomem *bgpio_map(struct platform_device *pdev, 
			       resource_size_t sane_sz,

			       resource_size_t sane_sz,

			       int *err)

			       int *err)

{

{

	struct device *dev = &pdev->dev;

	struct resource *r;

	struct resource *r;

	resource_size_t start;

	resource_size_t sz;

	resource_size_t sz;

	void __iomem *ret;

	void __iomem *ret;
@@ -602,15 +600,9 @@ static void __iomem *bgpio_map(struct platform_device *pdev, 
		return NULL;

		return NULL;

	}

	}





	start = r->start;

	ret = devm_ioremap_resource(&pdev->dev, r);

	if (!devm_request_mem_region(dev, start, sz, r->name)) {

	if (IS_ERR(ret)) {

		*err = -EBUSY;

		*err = PTR_ERR(ret);

		return NULL;

	}



	ret = devm_ioremap(dev, start, sz);

	if (!ret) {

		*err = -ENOMEM;

		return NULL;

		return NULL;

	}

	}