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

Commit 34ffd85d authored by Linus Walleij's avatar Linus Walleij
Browse files

gpio: refer to gpio device in prints and debugfs 



We use the new struct device inside gpio_chip to related debug
prints and warnings, and we also add it to the debugfs dump.

Cc: Johan Hovold <johan@kernel.org>
Cc: Michael Welling <mwelling@ieee.org>
Cc: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent ff2b1359

drivers/gpio/gpiolib.c

+3 −3
Original line number Diff line number Diff line
@@ -304,8 +304,8 @@ static int gpiochip_set_desc_names(struct gpio_chip *gc) 


		gpio = gpio_name_to_desc(gc->names[i]);

		if (gpio)

			dev_warn(gc->parent, "Detected name collision for "

				 "GPIO name '%s'\n",

			dev_warn(&gc->gpiodev->dev,

				 "Detected name collision for GPIO name '%s'\n",

				 gc->names[i]);

	}
@@ -528,7 +528,7 @@ void gpiochip_remove(struct gpio_chip *chip) 
	spin_unlock_irqrestore(&gpio_lock, flags);



	if (requested)

		dev_crit(chip->parent,

		dev_crit(&chip->gpiodev->dev,

			 "REMOVING GPIOCHIP WITH GPIOS STILL REQUESTED\n");



	/* FIXME: need to be moved to gpio_device and held there */

drivers/gpio/gpiolib.h

+6 −6
Original line number Diff line number Diff line
@@ -174,17 +174,17 @@ static int __maybe_unused gpio_chip_hwgpio(const struct gpio_desc *desc) 
/* With chip prefix */



#define chip_emerg(chip, fmt, ...)					\

	pr_emerg("GPIO chip %s: " fmt, chip->label, ##__VA_ARGS__)

	dev_emerg(&chip->gpiodev->dev, "(%s): " fmt, chip->label, ##__VA_ARGS__)

#define chip_crit(chip, fmt, ...)					\

	pr_crit("GPIO chip %s: " fmt, chip->label, ##__VA_ARGS__)

	dev_crit(&chip->gpiodev->dev, "(%s): " fmt, chip->label, ##__VA_ARGS__)

#define chip_err(chip, fmt, ...)					\

	pr_err("GPIO chip %s: " fmt, chip->label, ##__VA_ARGS__)

	dev_err(&chip->gpiodev->dev, "(%s): " fmt, chip->label, ##__VA_ARGS__)

#define chip_warn(chip, fmt, ...)					\

	pr_warn("GPIO chip %s: " fmt, chip->label, ##__VA_ARGS__)

	dev_warn(&chip->gpiodev->dev, "(%s): " fmt, chip->label, ##__VA_ARGS__)

#define chip_info(chip, fmt, ...)					\

	pr_info("GPIO chip %s: " fmt, chip->label, ##__VA_ARGS__)

	dev_info(&chip->gpiodev->dev, "(%s): " fmt, chip->label, ##__VA_ARGS__)

#define chip_dbg(chip, fmt, ...)					\

	pr_debug("GPIO chip %s: " fmt, chip->label, ##__VA_ARGS__)

	dev_dbg(&chip->gpiodev->dev, "(%s): " fmt, chip->label, ##__VA_ARGS__)



#ifdef CONFIG_GPIO_SYSFS