From: Kun Yi <kunyi@google.com>
To: linux-leds@vger.kernel.org
Cc: Kun Yi <kunyi@google.com>,
jacek.anaszewski@gmail.com, pavel@ucw.cz, dmurphy@ti.com,
u.kleine-koenig@pengutronix.de, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] ledtrig-gpio: 0 is a valid GPIO number
Date: Thu, 16 May 2019 14:42:09 -0700 [thread overview]
Message-ID: <20190516214209.139726-3-kunyi@google.com> (raw)
In-Reply-To: <20190516214209.139726-1-kunyi@google.com>
GPIO number 0 is a valid case to handle. Use -1 as initial value
and use gpio_is_valid() to determine validity of the GPIO
number.
Signed-off-by: Kun Yi <kunyi@google.com>
Change-Id: I4a29f98b237fd0d8ba4dd2a28219d4429f2ccfff
---
drivers/leds/trigger/ledtrig-gpio.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/drivers/leds/trigger/ledtrig-gpio.c b/drivers/leds/trigger/ledtrig-gpio.c
index f6d50e031492..48d8ef8538bd 100644
--- a/drivers/leds/trigger/ledtrig-gpio.c
+++ b/drivers/leds/trigger/ledtrig-gpio.c
@@ -22,7 +22,7 @@ struct gpio_trig_data {
unsigned desired_brightness; /* desired brightness when led is on */
unsigned inverted; /* true when gpio is inverted */
- unsigned gpio; /* gpio that triggers the leds */
+ int gpio; /* gpio that triggers the leds */
};
static irqreturn_t gpio_trig_irq(int irq, void *_led)
@@ -114,13 +114,12 @@ static ssize_t gpio_trig_gpio_show(struct device *dev,
{
struct gpio_trig_data *gpio_data = led_trigger_get_drvdata(dev);
- return sprintf(buf, "%u\n", gpio_data->gpio);
+ return sprintf(buf, "%d\n", gpio_data->gpio);
}
-static inline void free_used_gpio_if_valid(unsigned int gpio,
- struct led_classdev *led)
+static inline void free_used_gpio_if_valid(int gpio, struct led_classdev *led)
{
- if (gpio == 0)
+ if (!gpio_is_valid(gpio))
return;
free_irq(gpio_to_irq(gpio), led);
@@ -144,12 +143,6 @@ static ssize_t gpio_trig_gpio_store(struct device *dev,
if (gpio_data->gpio == gpio)
return n;
- if (!gpio) {
- free_used_gpio_if_valid(gpio_data->gpio, led);
- gpio_data->gpio = 0;
- return n;
- }
-
ret = gpio_request(gpio, "ledtrig-gpio");
if (ret) {
dev_err(dev, "gpio_request failed with error %d\n", ret);
@@ -195,6 +188,7 @@ static int gpio_trig_activate(struct led_classdev *led)
return -ENOMEM;
gpio_data->led = led;
+ gpio_data->gpio = -1;
led_set_trigger_data(led, gpio_data);
return 0;
--
2.21.0.1020.gf2820cf01a-goog
next prev parent reply other threads:[~2019-05-16 21:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-16 21:42 [PATCH 0/2] Fix LED GPIO trigger behavior Kun Yi
2019-05-16 21:42 ` [PATCH 1/2] ledtrig-gpio: Request user input pin as GPIO Kun Yi
2019-05-17 6:26 ` Uwe Kleine-König
2019-05-16 21:42 ` Kun Yi [this message]
2019-05-17 6:27 ` [PATCH 2/2] ledtrig-gpio: 0 is a valid GPIO number Uwe Kleine-König
2019-05-17 16:56 ` [PATCH 0/2] Fix LED GPIO trigger behavior Jacek Anaszewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190516214209.139726-3-kunyi@google.com \
--to=kunyi@google.com \
--cc=dmurphy@ti.com \
--cc=jacek.anaszewski@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox