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

Commit 8a06b08e authored by William Breathitt Gray's avatar William Breathitt Gray Committed by Linus Walleij
Browse files

gpio: ich: Use devm_request_region 



By the time request_region is called in the Intel ICH series GPIO
driver, a corresponding device structure has already been allocated. The
devm_request_region function should be used to help simplify the cleanup
code and reduce the possible points of failure.

Cc: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: default avatarWilliam Breathitt Gray <vilhelm.gray@gmail.com>
Reviewed-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 35568c40

drivers/gpio/gpio-ich.c

+9 −42
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/ioport.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/gpio.h>
@@ -384,8 +385,8 @@ static struct ichx_desc avoton_desc = { 
	.use_outlvl_cache = true,

};



static int ichx_gpio_request_regions(struct resource *res_base,

						const char *name, u8 use_gpio)

static int ichx_gpio_request_regions(struct device *dev,

	struct resource *res_base, const char *name, u8 use_gpio)

{

	int i;
@@ -395,34 +396,12 @@ static int ichx_gpio_request_regions(struct resource *res_base, 
	for (i = 0; i < ARRAY_SIZE(ichx_priv.desc->regs[0]); i++) {

		if (!(use_gpio & (1 << i)))

			continue;

		if (!request_region(

		if (!devm_request_region(dev,

				res_base->start + ichx_priv.desc->regs[0][i],

				ichx_priv.desc->reglen[i], name))

			goto request_err;

	}

	return 0;



request_err:

	/* Clean up: release already requested regions, if any */

	for (i--; i >= 0; i--) {

		if (!(use_gpio & (1 << i)))

			continue;

		release_region(res_base->start + ichx_priv.desc->regs[0][i],

			       ichx_priv.desc->reglen[i]);

	}

			return -EBUSY;

	}



static void ichx_gpio_release_regions(struct resource *res_base, u8 use_gpio)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(ichx_priv.desc->regs[0]); i++) {

		if (!(use_gpio & (1 << i)))

			continue;

		release_region(res_base->start + ichx_priv.desc->regs[0][i],

			       ichx_priv.desc->reglen[i]);

	}

	return 0;

}



static int ichx_gpio_probe(struct platform_device *pdev)
@@ -468,7 +447,7 @@ static int ichx_gpio_probe(struct platform_device *pdev) 
	spin_lock_init(&ichx_priv.lock);

	res_base = platform_get_resource(pdev, IORESOURCE_IO, ICH_RES_GPIO);

	ichx_priv.use_gpio = ich_info->use_gpio;

	err = ichx_gpio_request_regions(res_base, pdev->name,

	err = ichx_gpio_request_regions(&pdev->dev, res_base, pdev->name,

					ichx_priv.use_gpio);

	if (err)

		return err;
@@ -489,8 +468,8 @@ static int ichx_gpio_probe(struct platform_device *pdev) 
		goto init;

	}



	if (!request_region(res_pm->start, resource_size(res_pm),

			pdev->name)) {

	if (!devm_request_region(&pdev->dev, res_pm->start,

			resource_size(res_pm), pdev->name)) {

		pr_warn("ACPI BAR is busy, GPI 0 - 15 unavailable\n");

		goto init;

	}
@@ -502,31 +481,19 @@ static int ichx_gpio_probe(struct platform_device *pdev) 
	err = gpiochip_add_data(&ichx_priv.chip, NULL);

	if (err) {

		pr_err("Failed to register GPIOs\n");

		goto add_err;

		return err;

	}



	pr_info("GPIO from %d to %d on %s\n", ichx_priv.chip.base,

	       ichx_priv.chip.base + ichx_priv.chip.ngpio - 1, DRV_NAME);



	return 0;



add_err:

	ichx_gpio_release_regions(ichx_priv.gpio_base, ichx_priv.use_gpio);

	if (ichx_priv.pm_base)

		release_region(ichx_priv.pm_base->start,

				resource_size(ichx_priv.pm_base));

	return err;

}



static int ichx_gpio_remove(struct platform_device *pdev)

{

	gpiochip_remove(&ichx_priv.chip);



	ichx_gpio_release_regions(ichx_priv.gpio_base, ichx_priv.use_gpio);

	if (ichx_priv.pm_base)

		release_region(ichx_priv.pm_base->start,

				resource_size(ichx_priv.pm_base));



	return 0;

}