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

Commit 5c34b6c1 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Walleij
Browse files

gpiolib: acpi: Consolidate debug output in acpi_gpio_update_gpiod_flags() 



We have the duplicated debug strings printed whenever
acpi_gpio_update_gpiod_flags() fails. Instead of doing this by callers,
move the debug output inside function.

In one case convert almost useless pr_debug() to dev_dbg() where
actual consumer of GPIO resource is disclosed.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 5870cff4

drivers/gpio/gpiolib-acpi.c

+16 −7
Original line number Diff line number Diff line
@@ -461,8 +461,8 @@ acpi_gpio_to_gpiod_flags(const struct acpi_resource_gpio *agpio) 
	}

}



int

acpi_gpio_update_gpiod_flags(enum gpiod_flags *flags, enum gpiod_flags update)

static int

__acpi_gpio_update_gpiod_flags(enum gpiod_flags *flags, enum gpiod_flags update)

{

	int ret = 0;
@@ -489,6 +489,19 @@ acpi_gpio_update_gpiod_flags(enum gpiod_flags *flags, enum gpiod_flags update) 
	return ret;

}



int

acpi_gpio_update_gpiod_flags(enum gpiod_flags *flags, struct acpi_gpio_info *info)

{

	struct device *dev = &info->adev->dev;

	int ret;



	ret = __acpi_gpio_update_gpiod_flags(flags, info->flags);

	if (ret)

		dev_dbg(dev, "Override GPIO initialization flags\n");



	return ret;

}



struct acpi_gpio_lookup {

	struct acpi_gpio_info info;

	int index;
@@ -661,7 +674,6 @@ struct gpio_desc *acpi_find_gpio(struct device *dev, 
	struct acpi_gpio_info info;

	struct gpio_desc *desc;

	char propname[32];

	int err;

	int i;



	/* Try first from _DSD */
@@ -700,10 +712,7 @@ struct gpio_desc *acpi_find_gpio(struct device *dev, 
	if (info.polarity == GPIO_ACTIVE_LOW)

		*lookupflags |= GPIO_ACTIVE_LOW;



	err = acpi_gpio_update_gpiod_flags(dflags, info.flags);

	if (err)

		dev_dbg(dev, "Override GPIO initialization flags\n");



	acpi_gpio_update_gpiod_flags(dflags, &info);

	return desc;

}

drivers/gpio/gpiolib.c

+1 −3
Original line number Diff line number Diff line
@@ -3681,9 +3681,7 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode, 
		desc = acpi_node_get_gpiod(fwnode, propname, index, &info);

		if (!IS_ERR(desc)) {

			active_low = info.polarity == GPIO_ACTIVE_LOW;

			ret = acpi_gpio_update_gpiod_flags(&dflags, info.flags);

			if (ret)

				pr_debug("Override GPIO initialization flags\n");

			acpi_gpio_update_gpiod_flags(&dflags, &info);

		}

	}

drivers/gpio/gpiolib.h

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ void acpi_gpiochip_request_interrupts(struct gpio_chip *chip); 
void acpi_gpiochip_free_interrupts(struct gpio_chip *chip);



int acpi_gpio_update_gpiod_flags(enum gpiod_flags *flags,

				 enum gpiod_flags update);

				 struct acpi_gpio_info *info);



struct gpio_desc *acpi_find_gpio(struct device *dev,

				 const char *con_id,
@@ -151,7 +151,7 @@ static inline void 
acpi_gpiochip_free_interrupts(struct gpio_chip *chip) { }



static inline int

acpi_gpio_update_gpiod_flags(enum gpiod_flags *flags, enum gpiod_flags update)

acpi_gpio_update_gpiod_flags(enum gpiod_flags *flags, struct acpi_gpio_info *info)

{

	return 0;

}