Commit d4f335b4 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

gpiolib: rename GPIO chip printk macros 



The chip_$level() macros take struct gpio_chip as argument so make it
follow the convention of using the 'gpiochip_' prefix.

Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent 0ba6f1ed

drivers/gpio/gpiolib-cdev.c

+1 −1
Original line number Diff line number Diff line
@@ -2823,7 +2823,7 @@ int gpiolib_cdev_register(struct gpio_device *gdev, dev_t devt) 
	if (!gc)

		return -ENODEV;



	chip_dbg(gc, "added GPIO chardev (%d:%d)\n", MAJOR(devt), gdev->id);

	gpiochip_dbg(gc, "added GPIO chardev (%d:%d)\n", MAJOR(devt), gdev->id);



	return 0;

}

drivers/gpio/gpiolib-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1091,7 +1091,7 @@ static int gpiofind_sysfs_register(struct gpio_chip *gc, const void *data) 


	ret = gpiochip_sysfs_register(gdev);

	if (ret)

		chip_err(gc, "failed to register the sysfs entry: %d\n", ret);

		gpiochip_err(gc, "failed to register the sysfs entry: %d\n", ret);



	return 0;

}

drivers/gpio/gpiolib.c

+39 −41
Original line number Diff line number Diff line
@@ -921,8 +921,8 @@ static void gpiochip_machine_hog(struct gpio_chip *gc, struct gpiod_hog *hog) 


	desc = gpiochip_get_desc(gc, hog->chip_hwnum);

	if (IS_ERR(desc)) {

		chip_err(gc, "%s: unable to get GPIO desc: %ld\n", __func__,

			 PTR_ERR(desc));

		gpiochip_err(gc, "%s: unable to get GPIO desc: %ld\n",

			     __func__, PTR_ERR(desc));

		return;

	}
@@ -1124,7 +1124,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, 


		ret = gpiodev_add_to_list_unlocked(gdev);

		if (ret) {

			chip_err(gc, "GPIO integer space overlap, cannot add chip\n");

			gpiochip_err(gc, "GPIO integer space overlap, cannot add chip\n");

			goto err_free_label;

		}

	}
@@ -1528,8 +1528,7 @@ static void gpiochip_set_hierarchical_irqchip(struct gpio_chip *gc, 
							  &parent_hwirq,

							  &parent_type);

			if (ret) {

				chip_err(gc, "skip set-up on hwirq %d\n",

					 i);

				gpiochip_err(gc, "skip set-up on hwirq %d\n", i);

				continue;

			}
@@ -1542,15 +1541,14 @@ static void gpiochip_set_hierarchical_irqchip(struct gpio_chip *gc, 
			ret = irq_domain_alloc_irqs(gc->irq.domain, 1,

						    NUMA_NO_NODE, &fwspec);

			if (ret < 0) {

				chip_err(gc,

				gpiochip_err(gc,

					     "can not allocate irq for GPIO line %d parent hwirq %d in hierarchy domain: %d\n",

					 i, parent_hwirq,

					 ret);

					     i, parent_hwirq, ret);

			}

		}

	}



	chip_err(gc, "%s unknown fwnode type proceed anyway\n", __func__);

	gpiochip_err(gc, "%s unknown fwnode type proceed anyway\n", __func__);



	return;

}
@@ -1602,15 +1600,15 @@ static int gpiochip_hierarchy_irq_domain_alloc(struct irq_domain *d, 
	if (ret)

		return ret;



	chip_dbg(gc, "allocate IRQ %d, hwirq %lu\n", irq, hwirq);

	gpiochip_dbg(gc, "allocate IRQ %d, hwirq %lu\n", irq, hwirq);



	ret = girq->child_to_parent_hwirq(gc, hwirq, type,

					  &parent_hwirq, &parent_type);

	if (ret) {

		chip_err(gc, "can't look up hwirq %lu\n", hwirq);

		gpiochip_err(gc, "can't look up hwirq %lu\n", hwirq);

		return ret;

	}

	chip_dbg(gc, "found parent hwirq %u\n", parent_hwirq);

	gpiochip_dbg(gc, "found parent hwirq %u\n", parent_hwirq);



	/*

	 * We set handle_bad_irq because the .set_type() should
@@ -1631,7 +1629,7 @@ static int gpiochip_hierarchy_irq_domain_alloc(struct irq_domain *d, 
	if (ret)

		return ret;



	chip_dbg(gc, "alloc_irqs_parent for %d parent hwirq %d\n",

	gpiochip_dbg(gc, "alloc_irqs_parent for %d parent hwirq %d\n",

		     irq, parent_hwirq);

	irq_set_lockdep_class(irq, gc->irq.lock_key, gc->irq.request_key);

	ret = irq_domain_alloc_irqs_parent(d, irq, 1, &gpio_parent_fwspec);
@@ -1642,7 +1640,7 @@ static int gpiochip_hierarchy_irq_domain_alloc(struct irq_domain *d, 
	if (irq_domain_is_msi(d->parent) && (ret == -EEXIST))

		ret = 0;

	if (ret)

		chip_err(gc,

		gpiochip_err(gc,

			     "failed to allocate parent hwirq %d for hwirq %lu\n",

			     parent_hwirq, hwirq);
@@ -1720,7 +1718,7 @@ static struct irq_domain *gpiochip_hierarchy_create_domain(struct gpio_chip *gc) 


	if (!gc->irq.child_to_parent_hwirq ||

	    !gc->irq.fwnode) {

		chip_err(gc, "missing irqdomain vital data\n");

		gpiochip_err(gc, "missing irqdomain vital data\n");

		return ERR_PTR(-EINVAL);

	}
@@ -1993,7 +1991,7 @@ static void gpiochip_set_irq_hooks(struct gpio_chip *gc) 
	if (irqchip->flags & IRQCHIP_IMMUTABLE)

		return;



	chip_warn(gc, "not an immutable chip, please consider fixing it!\n");

	gpiochip_warn(gc, "not an immutable chip, please consider fixing it!\n");



	if (!irqchip->irq_request_resources &&

	    !irqchip->irq_release_resources) {
@@ -2009,7 +2007,7 @@ static void gpiochip_set_irq_hooks(struct gpio_chip *gc) 
		 * ...and if so, give a gentle warning that this is bad

		 * practice.

		 */

		chip_info(gc,

		gpiochip_info(gc,

			      "detected irqchip that is shared with multiple gpiochips: please fix the driver.\n");

		return;

	}
@@ -2039,7 +2037,8 @@ static int gpiochip_irqchip_add_allocated_domain(struct gpio_chip *gc, 
		return -EINVAL;



	if (gc->to_irq)

		chip_warn(gc, "to_irq is redefined in %s and you shouldn't rely on it\n", __func__);

		gpiochip_warn(gc, "to_irq is redefined in %s and you shouldn't rely on it\n",

			      __func__);



	gc->to_irq = gpiochip_to_irq;

	gc->irq.domain = domain;
@@ -2080,7 +2079,7 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc, 
		return 0;



	if (gc->irq.parent_handler && gc->can_sleep) {

		chip_err(gc, "you cannot have chained interrupts on a chip that may sleep\n");

		gpiochip_err(gc, "you cannot have chained interrupts on a chip that may sleep\n");

		return -EINVAL;

	}
@@ -2336,7 +2335,7 @@ int gpiochip_add_pingroup_range(struct gpio_chip *gc, 


	pinctrl_add_gpio_range(pctldev, &pin_range->range);



	chip_dbg(gc, "created GPIO range %d->%d ==> %s PINGRP %s\n",

	gpiochip_dbg(gc, "created GPIO range %d->%d ==> %s PINGRP %s\n",

		 gpio_offset, gpio_offset + pin_range->range.npins - 1,

		 pinctrl_dev_get_devname(pctldev), pin_group);
@@ -2392,18 +2391,17 @@ int gpiochip_add_pin_range_with_pins(struct gpio_chip *gc, 
			&pin_range->range);

	if (IS_ERR(pin_range->pctldev)) {

		ret = PTR_ERR(pin_range->pctldev);

		chip_err(gc, "could not create pin range\n");

		gpiochip_err(gc, "could not create pin range\n");

		kfree(pin_range);

		return ret;

	}

	if (pin_range->range.pins)

		chip_dbg(gc, "created GPIO range %d->%d ==> %s %d sparse PIN range { %d, ... }",

		gpiochip_dbg(gc, "created GPIO range %d->%d ==> %s %d sparse PIN range { %d, ... }",

			     gpio_offset, gpio_offset + npins - 1,

			     pinctl_name, npins, pins[0]);

	else

		chip_dbg(gc, "created GPIO range %d->%d ==> %s PIN %d->%d\n",

			 gpio_offset, gpio_offset + npins - 1,

			 pinctl_name,

		gpiochip_dbg(gc, "created GPIO range %d->%d ==> %s PIN %d->%d\n",

			     gpio_offset, gpio_offset + npins - 1, pinctl_name,

			     pin_offset, pin_offset + npins - 1);



	list_add_tail(&pin_range->node, &gdev->pin_ranges);
@@ -2614,7 +2612,7 @@ struct gpio_desc *gpiochip_request_own_desc(struct gpio_chip *gc, 
	int ret;



	if (IS_ERR(desc)) {

		chip_err(gc, "failed to get GPIO %s descriptor\n", name);

		gpiochip_err(gc, "failed to get GPIO %s descriptor\n", name);

		return desc;

	}
@@ -2625,7 +2623,7 @@ struct gpio_desc *gpiochip_request_own_desc(struct gpio_chip *gc, 
	ret = gpiod_configure_flags(desc, label, lflags, dflags);

	if (ret) {

		gpiod_free_commit(desc);

		chip_err(gc, "setup of own GPIO %s failed\n", name);

		gpiochip_err(gc, "setup of own GPIO %s failed\n", name);

		return ERR_PTR(ret);

	}
@@ -4052,7 +4050,7 @@ int gpiochip_lock_as_irq(struct gpio_chip *gc, unsigned int offset) 
		int dir = gpiod_get_direction(desc);



		if (dir < 0) {

			chip_err(gc, "%s: cannot get GPIO direction\n",

			gpiochip_err(gc, "%s: cannot get GPIO direction\n",

				     __func__);

			return dir;

		}
@@ -4061,7 +4059,7 @@ int gpiochip_lock_as_irq(struct gpio_chip *gc, unsigned int offset) 
	/* To be valid for IRQ the line needs to be input or open drain */

	if (test_bit(GPIOD_FLAG_IS_OUT, &desc->flags) &&

	    !test_bit(GPIOD_FLAG_OPEN_DRAIN, &desc->flags)) {

		chip_err(gc,

		gpiochip_err(gc,

			     "%s: tried to flag a GPIO set as output for IRQ\n",

			     __func__);

		return -EIO;
@@ -4140,7 +4138,7 @@ int gpiochip_reqres_irq(struct gpio_chip *gc, unsigned int offset) 


	ret = gpiochip_lock_as_irq(gc, offset);

	if (ret) {

		chip_err(gc, "unable to lock HW IRQ %u for IRQ\n", offset);

		gpiochip_err(gc, "unable to lock HW IRQ %u for IRQ\n", offset);

		module_put(gc->gpiodev->owner);

		return ret;

	}

drivers/gpio/gpiolib.h

+4 −4
Original line number Diff line number Diff line
@@ -309,13 +309,13 @@ do { \ 


/* With chip prefix */



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

#define gpiochip_err(gc, fmt, ...) \

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

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

#define gpiochip_warn(gc, fmt, ...) \

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

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

#define gpiochip_info(gc, fmt, ...) \

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

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

#define gpiochip_dbg(gc, fmt, ...) \

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



#endif /* GPIOLIB_H */