Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1b9c0fb365cbb1154f4e7997061db972cbf58300

Authored by Tony Lindgren
1 parent dc7743aa3c
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

pinctrl: single: Fix build when not built on ARM 

Looks like we need a little bit of arch specific handling
with the generic IRQ. Fix the issue with an ifdef the
same way as other drivers do.

ARM needs things set to IRQF_VALID, which also then sets
noprobe. Others seem to use just irq_set_noprobe().

Otherwise we can get:

drivers/pinctrl/pinctrl-single.c: In function 'pcs_irqdomain_map':
drivers/pinctrl/pinctrl-single.c:1750:2: error: implicit declaration of function 'set_irq_flags' [-Werror=implicit-function-declaration]
drivers/pinctrl/pinctrl-single.c:1750:21: error: 'IRQF_VALID' undeclared (first use in this function)
drivers/pinctrl/pinctrl-single.c:1750:34: error: 'IRQF_PROBE' undeclared (first use in this function)

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Showing 1 changed file with 6 additions and 1 deletions Side-by-side Diff

drivers/pinctrl/pinctrl-single.c
Diff comments   View file @ 1b9c0fb
... ... @@ -1747,7 +1747,12 @@
1747 1747 irq_set_chip_data(irq, pcs_soc);
1748 1748 irq_set_chip_and_handler(irq, &pcs->chip,
1749 1749 handle_level_irq);
1750   - set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
  1750 +
  1751 +#ifdef CONFIG_ARM
  1752 + set_irq_flags(irq, IRQF_VALID);
  1753 +#else
  1754 + irq_set_noprobe(irq);
  1755 +#endif
1751 1756  
1752 1757 return 0;
1753 1758 }