tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

GPIO: gpio-pxa: fix building without CONFIG_OF

Commit 7212157267 ("GPIO: gpio-pxa: fix devicetree functions") added an
"xlate" function pointer to the irq_domain_ops, but this function is nor
declared or defined anywhere when CONFIG_OF is disabled, causing the
build error:

drivers/gpio/gpio-pxa.c:532:11: error: 'irq_domain_xlate_twocell' undeclared here (not in a function)

Extending the DT-only code section to cover the irq_domain_ops and the
pxa_gpio_dt_ids solves this problem and makes it clearer which code is
actually used without DT.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Arnd Bergmann and committed by
Linus Torvalds f43e04ec 3bf671af

+2 -2
+2 -2
drivers/gpio/gpio-pxa.c
··· 512 512 return count; 513 513 } 514 514 515 + #ifdef CONFIG_OF 515 516 static struct of_device_id pxa_gpio_dt_ids[] = { 516 517 { .compatible = "mrvl,pxa-gpio" }, 517 518 { .compatible = "mrvl,mmp-gpio", .data = (void *)MMP_GPIO }, ··· 533 532 .xlate = irq_domain_xlate_twocell, 534 533 }; 535 534 536 - #ifdef CONFIG_OF 537 535 static int __devinit pxa_gpio_probe_dt(struct platform_device *pdev) 538 536 { 539 537 int ret, nr_banks, nr_gpios, irq_base; ··· 679 679 .probe = pxa_gpio_probe, 680 680 .driver = { 681 681 .name = "pxa-gpio", 682 - .of_match_table = pxa_gpio_dt_ids, 682 + .of_match_table = of_match_ptr(pxa_gpio_dt_ids), 683 683 }, 684 684 }; 685 685