projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bc41f9f
)
pinctrl: nomadik: always display IRQ in debugfs
author
Linus Walleij
<
[email protected]
>
Thu, 14 Nov 2013 18:51:18 +0000
(19:51 +0100)
committer
Linus Walleij
<
[email protected]
>
Mon, 25 Nov 2013 08:08:30 +0000
(09:08 +0100)
As we now grab IRQs also without first reserving the GPIO
line, let's print the mapped IRQ unconditionally in the
debugfs file as well.
Signed-off-by: Linus Walleij <
[email protected]
>
drivers/pinctrl/pinctrl-nomadik.c
patch
|
blob
|
history
diff --git
a/drivers/pinctrl/pinctrl-nomadik.c
b/drivers/pinctrl/pinctrl-nomadik.c
index 7111c3b591303cec2f3daa36d22329989c0847b9..cea951f5fa4931926435a692b2f665278bc2d764 100644
(file)
--- a/
drivers/pinctrl/pinctrl-nomadik.c
+++ b/
drivers/pinctrl/pinctrl-nomadik.c
@@
-846,14
+846,14
@@
static void nmk_gpio_dbg_show_one(struct seq_file *s,
(mode < 0) ? "unknown" : modes[mode],
pull ? "pull" : "none");
- if (
label &&
!is_out) {
- int
irq = gpio_to_irq(gpio);
+ if (!is_out) {
+ int irq = gpio_to_irq(gpio);
struct irq_desc *desc = irq_to_desc(irq);
/* This races with request_irq(), set_irq_type(),
* and set_irq_wake() ... but those are "rare".
*/
- if (irq >
= 0
&& desc->action) {
+ if (irq >
0 && desc
&& desc->action) {
char *trigger;
u32 bitmask = nmk_gpio_get_bitmask(gpio);