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

gpiolib: remove gpiochip_is_requested() 



We have no external users of gpiochip_is_requested(). Let's remove it
and replace its internal calls with direct testing of the REQUESTED flag.

Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 6fd9c993

drivers/gpio/gpiolib.c

+13 −35
Original line number Diff line number Diff line
@@ -1071,7 +1071,7 @@ void gpiochip_remove(struct gpio_chip *gc) 


	spin_lock_irqsave(&gpio_lock, flags);

	for (i = 0; i < gdev->ngpio; i++) {

		if (gpiochip_is_requested(gc, i))

		if (test_bit(FLAG_REQUESTED, &gdev->descs[i].flags))

			break;

	}

	spin_unlock_irqrestore(&gpio_lock, flags);
@@ -2359,33 +2359,6 @@ void gpiod_free(struct gpio_desc *desc) 
	gpio_device_put(desc->gdev);

}



/**

 * gpiochip_is_requested - return string iff signal was requested

 * @gc: controller managing the signal

 * @offset: of signal within controller's 0..(ngpio - 1) range

 *

 * Returns NULL if the GPIO is not currently requested, else a string.

 * The string returned is the label passed to gpio_request(); if none has been

 * passed it is a meaningless, non-NULL constant.

 *

 * This function is for use by GPIO controller drivers.  The label can

 * help with diagnostics, and knowing that the signal is used as a GPIO

 * can help avoid accidentally multiplexing it to another controller.

 */

const char *gpiochip_is_requested(struct gpio_chip *gc, unsigned int offset)

{

	struct gpio_desc *desc;



	desc = gpiochip_get_desc(gc, offset);

	if (IS_ERR(desc))

		return NULL;



	if (test_bit(FLAG_REQUESTED, &desc->flags) == 0)

		return NULL;

	return desc->label;

}

EXPORT_SYMBOL_GPL(gpiochip_is_requested);



/**

 * gpiochip_dup_line_label - Get a copy of the consumer label.

 * @gc: GPIO chip controlling this line.
@@ -2400,18 +2373,23 @@ EXPORT_SYMBOL_GPL(gpiochip_is_requested); 
 */

char *gpiochip_dup_line_label(struct gpio_chip *gc, unsigned int offset)

{

	const char *label;

	char *copy;

	struct gpio_desc *desc;

	char *label;



	label = gpiochip_is_requested(gc, offset);

	if (!label)

	desc = gpiochip_get_desc(gc, offset);

	if (IS_ERR(desc))

		return NULL;



	copy = kstrdup(label, GFP_KERNEL);

	if (!copy)

	guard(spinlock_irqsave)(&gpio_lock);



	if (!test_bit(FLAG_REQUESTED, &desc->flags))

		return NULL;



	label = kstrdup(desc->label, GFP_KERNEL);

	if (!label)

		return ERR_PTR(-ENOMEM);



	return copy;

	return label;

}

EXPORT_SYMBOL_GPL(gpiochip_dup_line_label);

include/linux/gpio/driver.h

+0 −1
Original line number Diff line number Diff line
@@ -531,7 +531,6 @@ struct gpio_chip { 
#endif /* CONFIG_OF_GPIO */

};



const char *gpiochip_is_requested(struct gpio_chip *gc, unsigned int offset);

char *gpiochip_dup_line_label(struct gpio_chip *gc, unsigned int offset);