From: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Commit f2d347ff70be453e ("Input: gpio_keys - add device tree support for
interrupt only keys") caused the following build warning:
drivers/input/keyboard/gpio_keys.c: In function 'gpio_keys_probe':
drivers/input/keyboard/gpio_keys.c:647:15: warning: 'irq' may be used uninitialized in this function [-Wmaybe-uninitialized]
drivers/input/keyboard/gpio_keys.c:622:7: note: 'irq' was declared here
To fix this warning, do the 'irq' assignment inside the 'if' block that it is
actually used.
Reported-by: Olof's autobuilder <build@xxxxxxxxx>
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
---
Change since v1:
- Do the 'irq' assignment inside the 'if' block that it is actually used.
drivers/input/keyboard/gpio_keys.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index aa13055..6c33849 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -619,11 +619,12 @@ gpio_keys_get_devtree_pdata(struct device *dev)
i = 0;
for_each_child_of_node(node, pp) {
int gpio = -1;
- int irq;
enum of_gpio_flags flags;
if (!of_find_property(pp, "gpios", NULL)) {
- irq = irq_of_parse_and_map(pp, 0);
+ int irq = irq_of_parse_and_map(pp, 0);
+
+ button->irq = irq;
if (irq == 0) {
pdata->nbuttons--;
dev_warn(dev, "Found button without gpios or irqs\n");
@@ -644,7 +645,6 @@ gpio_keys_get_devtree_pdata(struct device *dev)
button = &pdata->buttons[i++];
button->gpio = gpio;
- button->irq = irq;
button->active_low = flags & OF_GPIO_ACTIVE_LOW;
if (of_property_read_u32(pp, "linux,code", &button->code)) {
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
