aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShobhit Kumar <shobhit.kumar@intel.com>2015-06-26 05:02:04 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-07-21 03:21:40 -0400
commitbe9015abb8296d8dc72cef4da75fa30e88ab7c81 (patch)
treedc056c1357a1138b7ba99c826a284e39fcd6ff6d
parent52721d9d3334c1cb1f76219a161084094ec634dc (diff)
gpiolib: Add support for removing registered consumer lookup table
In case we unload and load a driver module again that is registering a lookup table, without this it will result in multiple entries. Provide an option to remove the lookup table on driver unload Cc: Samuel Ortiz <sameo@linux.intel.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Alexandre Courbot <gnurou@gmail.com> Cc: Thierry Reding <thierry.reding@gmail.com> Reviewed-by: Alexandre Courbot <acourbot@nvidia.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Shobhit Kumar <shobhit.kumar@intel.com> Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpio/gpiolib.c13
-rw-r--r--include/linux/gpio/machine.h1
2 files changed, 14 insertions, 0 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index bf4bd1d120c3..f25dc880b007 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1672,6 +1672,19 @@ void gpiod_add_lookup_table(struct gpiod_lookup_table *table)
1672 mutex_unlock(&gpio_lookup_lock); 1672 mutex_unlock(&gpio_lookup_lock);
1673} 1673}
1674 1674
1675/**
1676 * gpiod_remove_lookup_table() - unregister GPIO device consumers
1677 * @table: table of consumers to unregister
1678 */
1679void gpiod_remove_lookup_table(struct gpiod_lookup_table *table)
1680{
1681 mutex_lock(&gpio_lookup_lock);
1682
1683 list_del(&table->list);
1684
1685 mutex_unlock(&gpio_lookup_lock);
1686}
1687
1675static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id, 1688static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
1676 unsigned int idx, 1689 unsigned int idx,
1677 enum gpio_lookup_flags *flags) 1690 enum gpio_lookup_flags *flags)
diff --git a/include/linux/gpio/machine.h b/include/linux/gpio/machine.h
index e2706140eaff..c0d712d22b07 100644
--- a/include/linux/gpio/machine.h
+++ b/include/linux/gpio/machine.h
@@ -57,5 +57,6 @@ struct gpiod_lookup_table {
57} 57}
58 58
59void gpiod_add_lookup_table(struct gpiod_lookup_table *table); 59void gpiod_add_lookup_table(struct gpiod_lookup_table *table);
60void gpiod_remove_lookup_table(struct gpiod_lookup_table *table);
60 61
61#endif /* __LINUX_GPIO_MACHINE_H */ 62#endif /* __LINUX_GPIO_MACHINE_H */