summaryrefslogtreecommitdiffstats
path: root/drivers/gpio
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-03-09 22:00:27 +0700
committerLinus Walleij <linus.walleij@linaro.org>2016-03-09 22:00:27 +0700
commit70aba44b6cade8dc63261c4f97d5e83b0c02d07a (patch)
tree8d6682d63567b7dc06d998aaea33a4f358b5f14a /drivers/gpio
parent7b1e5dc86c0030314f8f6e828177a6c5bb7b9006 (diff)
downloadop-kernel-dev-70aba44b6cade8dc63261c4f97d5e83b0c02d07a.zip
op-kernel-dev-70aba44b6cade8dc63261c4f97d5e83b0c02d07a.tar.gz
Revert "gpio: lp3943: Drop pin_used and lp3943_gpio_request/lp3943_gpio_free"
This reverts commit 3fab91ea284a3b795327dda915a3c150a49e4be2.
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/gpio-lp3943.c22
1 files changed, 22 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-lp3943.c b/drivers/gpio/gpio-lp3943.c
index fdec94b..6dc6725 100644
--- a/drivers/gpio/gpio-lp3943.c
+++ b/drivers/gpio/gpio-lp3943.c
@@ -45,6 +45,26 @@ struct lp3943_gpio {
u16 input_mask; /* 1 = GPIO is input direction, 0 = output */
};
+static int lp3943_gpio_request(struct gpio_chip *chip, unsigned offset)
+{
+ struct lp3943_gpio *lp3943_gpio = gpiochip_get_data(chip);
+ struct lp3943 *lp3943 = lp3943_gpio->lp3943;
+
+ /* Return an error if the pin is already assigned */
+ if (test_and_set_bit(offset, &lp3943->pin_used))
+ return -EBUSY;
+
+ return 0;
+}
+
+static void lp3943_gpio_free(struct gpio_chip *chip, unsigned offset)
+{
+ struct lp3943_gpio *lp3943_gpio = gpiochip_get_data(chip);
+ struct lp3943 *lp3943 = lp3943_gpio->lp3943;
+
+ clear_bit(offset, &lp3943->pin_used);
+}
+
static int lp3943_gpio_set_mode(struct lp3943_gpio *lp3943_gpio, u8 offset,
u8 val)
{
@@ -157,6 +177,8 @@ static int lp3943_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
static const struct gpio_chip lp3943_gpio_chip = {
.label = "lp3943",
.owner = THIS_MODULE,
+ .request = lp3943_gpio_request,
+ .free = lp3943_gpio_free,
.direction_input = lp3943_gpio_direction_input,
.get = lp3943_gpio_get,
.direction_output = lp3943_gpio_direction_output,
OpenPOWER on IntegriCloud