Commit f067372c authored by Bartosz Golaszewski's avatar Bartosz Golaszewski

gpio: remove the RW semaphore from the GPIO device

With all accesses to gdev->chip being protected with SRCU, we can now
remove the RW-semaphore specific to the character device which
fulfilled the same role up to this point.
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent d83cee3d
...@@ -963,7 +963,6 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, ...@@ -963,7 +963,6 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,
BLOCKING_INIT_NOTIFIER_HEAD(&gdev->line_state_notifier); BLOCKING_INIT_NOTIFIER_HEAD(&gdev->line_state_notifier);
BLOCKING_INIT_NOTIFIER_HEAD(&gdev->device_notifier); BLOCKING_INIT_NOTIFIER_HEAD(&gdev->device_notifier);
init_rwsem(&gdev->sem);
ret = init_srcu_struct(&gdev->srcu); ret = init_srcu_struct(&gdev->srcu);
if (ret) if (ret)
...@@ -1102,8 +1101,6 @@ void gpiochip_remove(struct gpio_chip *gc) ...@@ -1102,8 +1101,6 @@ void gpiochip_remove(struct gpio_chip *gc)
struct gpio_device *gdev = gc->gpiodev; struct gpio_device *gdev = gc->gpiodev;
unsigned int i; unsigned int i;
down_write(&gdev->sem);
/* FIXME: should the legacy sysfs handling be moved to gpio_device? */ /* FIXME: should the legacy sysfs handling be moved to gpio_device? */
gpiochip_sysfs_unregister(gdev); gpiochip_sysfs_unregister(gdev);
gpiochip_free_hogs(gc); gpiochip_free_hogs(gc);
...@@ -1142,7 +1139,6 @@ void gpiochip_remove(struct gpio_chip *gc) ...@@ -1142,7 +1139,6 @@ void gpiochip_remove(struct gpio_chip *gc)
* gone. * gone.
*/ */
gcdev_unregister(gdev); gcdev_unregister(gdev);
up_write(&gdev->sem);
gpio_device_put(gdev); gpio_device_put(gdev);
} }
EXPORT_SYMBOL_GPL(gpiochip_remove); EXPORT_SYMBOL_GPL(gpiochip_remove);
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include <linux/gpio/driver.h> #include <linux/gpio/driver.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/rwsem.h>
#include <linux/srcu.h> #include <linux/srcu.h>
#define GPIOCHIP_NAME "gpiochip" #define GPIOCHIP_NAME "gpiochip"
...@@ -46,9 +45,6 @@ ...@@ -46,9 +45,6 @@
* requested, released or reconfigured * requested, released or reconfigured
* @device_notifier: used to notify character device wait queues about the GPIO * @device_notifier: used to notify character device wait queues about the GPIO
* device being unregistered * device being unregistered
* @sem: protects the structure from a NULL-pointer dereference of @chip by
* user-space operations when the device gets unregistered during
* a hot-unplug event
* @srcu: protects the pointer to the underlying GPIO chip * @srcu: protects the pointer to the underlying GPIO chip
* @pin_ranges: range of pins served by the GPIO driver * @pin_ranges: range of pins served by the GPIO driver
* *
...@@ -73,7 +69,6 @@ struct gpio_device { ...@@ -73,7 +69,6 @@ struct gpio_device {
struct list_head list; struct list_head list;
struct blocking_notifier_head line_state_notifier; struct blocking_notifier_head line_state_notifier;
struct blocking_notifier_head device_notifier; struct blocking_notifier_head device_notifier;
struct rw_semaphore sem;
struct srcu_struct srcu; struct srcu_struct srcu;
#ifdef CONFIG_PINCTRL #ifdef CONFIG_PINCTRL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment