Input: gpio_keys - fix warning regarding uninitialized 'irq' variable

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Move button->irq initialization into proper branch and get rid of the
temporary.

Reported-by: Olof's autobuilder <build@lixom.net>
Reported-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Dmitry Torokhov 11 years ago af906faa 823a11fd

+2 -4

1 changed file

expand all

drivers

input

keyboard

gpio_keys.c

+2 -4

drivers/input/keyboard/gpio_keys.c

··· 619 619 i = 0; 620 620 for_each_child_of_node(node, pp) { 621 621 int gpio = -1; 622 - int irq; 623 622 enum of_gpio_flags flags; 624 623 625 624 if (!of_find_property(pp, "gpios", NULL)) { 626 - irq = irq_of_parse_and_map(pp, 0); 627 - if (irq == 0) { 625 + button->irq = irq_of_parse_and_map(pp, 0); 626 + if (button->irq == 0) { 628 627 pdata->nbuttons--; 629 628 dev_warn(dev, "Found button without gpios or irqs\n"); 630 629 continue; ··· 643 644 button = &pdata->buttons[i++]; 644 645 645 646 button->gpio = gpio; 646 - button->irq = irq; 647 647 button->active_low = flags & OF_GPIO_ACTIVE_LOW; 648 648 649 649 if (of_property_read_u32(pp, "linux,code", &button->code)) {