Skip to contentSkip to conversation

irqdomain: drop pointless NULL check in virq_debug_show_one

PATCH New Rasmus Villemoes 2 participants 2 messages Nov 12, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 irqdomain: drop pointless NULL check in virq_debug_show_one

We've already done data->irq and data->hwirq, and also unconditionally dereference data in the irq_data_get_irq_chip_data() call.

---
 kernel/irq/irqdomain.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/irq/irqdomain.c +1 -2
index ac4644e92b49..8aba7b4a2a91 100644
@@ -921,8 +921,7 @@ static void virq_debug_show_one(struct seq_file *m, struct irq_desc *desc)
 		chip = irq_data_get_irq_chip(data);
 		seq_printf(m, "%-15s  ", (chip && chip->name) ? chip->name : "none");
 
-		seq_printf(m, data ? "0x%p  " : "  %p  ",
-			   irq_data_get_irq_chip_data(data));
+		seq_printf(m, "0x%p  ", irq_data_get_irq_chip_data(data));
 
 		seq_printf(m, "   %c    ", (desc->action && desc->action->handler) ? '*' : ' ');
 		direct = (irq == hwirq) && (irq < domain->revmap_direct_max_irq);
Signature · 1 line
2.11.0
#1 lore raw

[tip:irq/core] irqdomain: Drop pointless NULL check in virq_debug_show_one

irqdomain: Drop pointless NULL check in virq_debug_show_one
Commit-ID:  306eb5a38dfc1a4c8a5c910c9844da6a97f2b9a4
Gitweb:     https://git.kernel.org/tip/306eb5a38dfc1a4c8a5c910c9844da6a97f2b9a4
Author:     Rasmus Villemoes <[email protected]>
AuthorDate: Sun, 12 Nov 2017 22:29:03 +0100
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Sun, 12 Nov 2017 23:25:40 +0100

irqdomain: Drop pointless NULL check in virq_debug_show_one

data has been already derefenced unconditionally, so it's pointless to do a NULL pointer check on it afterwards. Drop it.

[ tglx: Depersonify changelog. ]

---
 kernel/irq/irqdomain.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/irq/irqdomain.c +1 -2
index fbbf342..4f4f600 100644
@@ -921,8 +921,7 @@ static void virq_debug_show_one(struct seq_file *m, struct irq_desc *desc)
 		chip = irq_data_get_irq_chip(data);
 		seq_printf(m, "%-15s  ", (chip && chip->name) ? chip->name : "none");
 
-		seq_printf(m, data ? "0x%p  " : "  %p  ",
-			   irq_data_get_irq_chip_data(data));
+		seq_printf(m, "0x%p  ", irq_data_get_irq_chip_data(data));
 
 		seq_printf(m, "   %c    ", (desc->action && desc->action->handler) ? '*' : ' ');
 		direct = (irq == hwirq) && (irq < domain->revmap_direct_max_irq);