pinctrl: nomadik: Use irq_has_action() (f3925032) · Commits · 戴 / test

drivers/pinctrl/nomadik/pinctrl-nomadik.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -948,8 +948,8 @@ static void nmk_gpio_dbg_show_one(struct seq_file *s,
		(mode < 0) ? "unknown" : modes[mode]);
		} else {
		int irq = chip->to_irq(chip, offset);
		struct irq_desc *desc = irq_to_desc(irq);
		const int pullidx = pull ? 1 : 0;
		bool wake;
		int val;
		static const char * const pulls[] = {
		"none ",
		@@ -969,8 +969,9 @@ static void nmk_gpio_dbg_show_one(struct seq_file *s,
		* This races with request_irq(), set_irq_type(),
		* and set_irq_wake() ... but those are "rare".
		*/
		if (irq > 0 && desc && desc->action) {
		if (irq > 0 && irq_has_action(irq)) {
		char *trigger;
		bool wake;

		if (nmk_chip->edge_rising & BIT(offset))
		trigger = "edge-rising";
		@@ -979,10 +980,10 @@ static void nmk_gpio_dbg_show_one(struct seq_file *s,
		else
		trigger = "edge-undefined";

		wake = !!(nmk_chip->real_wake & BIT(offset));

		seq_printf(s, " irq-%d %s%s",
		irq, trigger,
		irqd_is_wakeup_set(&desc->irq_data)
		? " wakeup" : "");
		irq, trigger, wake ? " wakeup" : "");
		}
		}
		clk_disable(nmk_chip->clk);