evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GPIO: gpio-pxa: fix building without CONFIG_OF

Browse source 
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>
This commit is contained in:
Arnd Bergmann 2012-08-13 14:36:10 +00:00 • committed by Linus Torvalds
parent 3bf671af14
commit f43e04ec46
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpio/gpio-pxa.c
View file

@ -512,6 +512,7 @@ static int pxa_gpio_nums(void)
return count; return count;
} }
#ifdef CONFIG_OF
static struct of_device_id pxa_gpio_dt_ids[] = { static struct of_device_id pxa_gpio_dt_ids[] = {
{ .compatible = "mrvl,pxa-gpio" }, { .compatible = "mrvl,pxa-gpio" },
{ .compatible = "mrvl,mmp-gpio", .data = (void *)MMP_GPIO }, { .compatible = "mrvl,mmp-gpio", .data = (void *)MMP_GPIO },
@ -532,7 +533,6 @@ const struct irq_domain_ops pxa_irq_domain_ops = {
.xlate = irq_domain_xlate_twocell, .xlate = irq_domain_xlate_twocell,
}; };
#ifdef CONFIG_OF
static int __devinit pxa_gpio_probe_dt(struct platform_device *pdev) static int __devinit pxa_gpio_probe_dt(struct platform_device *pdev)
{ {
int ret, nr_banks, nr_gpios, irq_base; int ret, nr_banks, nr_gpios, irq_base;
@ -679,7 +679,7 @@ static struct platform_driver pxa_gpio_driver = {
.probe = pxa_gpio_probe, .probe = pxa_gpio_probe,
.driver = { .driver = {
.name = "pxa-gpio", .name = "pxa-gpio",
.of_match_table = pxa_gpio_dt_ids, .of_match_table = of_match_ptr(pxa_gpio_dt_ids),
}, },
}; };