iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpiolib: remove gpiochip_is_requested()

Browse Source 
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: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Bartosz Golaszewski 2023-12-04 10:35:09 +01:00
parent 6fd9c99334
commit f8d05e276b
2 changed files with 13 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/gpio/gpiolib.c
View File

@ -1071,7 +1071,7 @@ void gpiochip_remove(struct gpio_chip *gc)
spin_lock_irqsave(&gpio_lock, flags); spin_lock_irqsave(&gpio_lock, flags);
for (i = 0; i < gdev->ngpio; i++) { for (i = 0; i < gdev->ngpio; i++) {
if (gpiochip_is_requested(gc, i)) if (test_bit(FLAG_REQUESTED, &gdev->descs[i].flags))
break; break;
} }
spin_unlock_irqrestore(&gpio_lock, flags); spin_unlock_irqrestore(&gpio_lock, flags);
@ -2359,33 +2359,6 @@ void gpiod_free(struct gpio_desc *desc)
gpio_device_put(desc->gdev); 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. * gpiochip_dup_line_label - Get a copy of the consumer label.
* @gc: GPIO chip controlling this line. * @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) char *gpiochip_dup_line_label(struct gpio_chip *gc, unsigned int offset)
{ {
const char *label; struct gpio_desc *desc;
char *copy; char *label;
label = gpiochip_is_requested(gc, offset); desc = gpiochip_get_desc(gc, offset);
if (!label) if (IS_ERR(desc))
return NULL; return NULL;
copy = kstrdup(label, GFP_KERNEL); guard(spinlock_irqsave)(&gpio_lock);
if (!copy)
if (!test_bit(FLAG_REQUESTED, &desc->flags))
return NULL;
label = kstrdup(desc->label, GFP_KERNEL);
if (!label)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
return copy; return label;
} }
EXPORT_SYMBOL_GPL(gpiochip_dup_line_label); EXPORT_SYMBOL_GPL(gpiochip_dup_line_label);

1
include/linux/gpio/driver.h
View File

@ -531,7 +531,6 @@ struct gpio_chip {
#endif /* CONFIG_OF_GPIO */ #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); char *gpiochip_dup_line_label(struct gpio_chip *gc, unsigned int offset);