Message ID | 1480091802-14482-2-git-send-email-benjamin.tissoires@redhat.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On Fri, Nov 25, 2016 at 05:36:41PM +0100, Benjamin Tissoires wrote: > gpio_keys will later use gpio_is_valid(). To match the actual > behavior, we should use it here too. > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Applied, thank you. > > --- > > no changes in v3 > > Changes in v2: > - fixed gpio_is_valid(gpio) -> !gpio_is_valid(gpio) > --- > drivers/input/misc/soc_button_array.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c > index c14b827..bbd433c 100644 > --- a/drivers/input/misc/soc_button_array.c > +++ b/drivers/input/misc/soc_button_array.c > @@ -17,6 +17,7 @@ > #include <linux/acpi.h> > #include <linux/gpio/consumer.h> > #include <linux/gpio_keys.h> > +#include <linux/gpio.h> > #include <linux/platform_device.h> > > /* > @@ -92,7 +93,7 @@ soc_button_device_create(struct platform_device *pdev, > continue; > > gpio = soc_button_lookup_gpio(&pdev->dev, info->acpi_index); > - if (gpio < 0) > + if (!gpio_is_valid(gpio)) > continue; > > gpio_keys[n_buttons].type = info->event_type; > -- > 2.7.4 >
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c index c14b827..bbd433c 100644 --- a/drivers/input/misc/soc_button_array.c +++ b/drivers/input/misc/soc_button_array.c @@ -17,6 +17,7 @@ #include <linux/acpi.h> #include <linux/gpio/consumer.h> #include <linux/gpio_keys.h> +#include <linux/gpio.h> #include <linux/platform_device.h> /* @@ -92,7 +93,7 @@ soc_button_device_create(struct platform_device *pdev, continue; gpio = soc_button_lookup_gpio(&pdev->dev, info->acpi_index); - if (gpio < 0) + if (!gpio_is_valid(gpio)) continue; gpio_keys[n_buttons].type = info->event_type;
gpio_keys will later use gpio_is_valid(). To match the actual behavior, we should use it here too. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> --- no changes in v3 Changes in v2: - fixed gpio_is_valid(gpio) -> !gpio_is_valid(gpio) --- drivers/input/misc/soc_button_array.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)