genirq/debugfs: Remove pointless NULL pointer check

KAGA-KOKO · KAGA-KOKO · commit c2ce34c0a0e5 · 2017-06-24T11:43:53.000+02:00
debugfs_remove() has it's own NULL pointer check. Remove the conditional
and make irq_remove_debugfs_entry() an inline helper

Reported-by: kbuild test robot &lt;fengguang.wu@intel.com&gt;
Signed-off-by: Thomas Gleixner &lt;tglx@linutronix.de&gt;
diff --git a/kernel/irq/debugfs.c b/kernel/irq/debugfs.c
@@ -3,7 +3,6 @@
  *
  * This file is licensed under the GPL V2.
  */
-#include <linux/debugfs.h>
 #include <linux/irqdomain.h>
 #include <linux/irq.h>
 
@@ -191,12 +190,6 @@ void irq_add_debugfs_entry(unsigned int irq, struct irq_desc *desc)
 						 &dfs_irq_ops);
 }
 
-void irq_remove_debugfs_entry(struct irq_desc *desc)
-{
-	if (desc->debugfs_file)
-		debugfs_remove(desc->debugfs_file);
-}
-
 static int __init irq_debugfs_init(void)
 {
 	struct dentry *root_dir;
diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
@@ -318,8 +318,13 @@ static inline bool irq_fixup_move_pending(struct irq_desc *desc, bool fclear)
 #endif /* !CONFIG_GENERIC_PENDING_IRQ */
 
 #ifdef CONFIG_GENERIC_IRQ_DEBUGFS
+#include <linux/debugfs.h>
+
 void irq_add_debugfs_entry(unsigned int irq, struct irq_desc *desc);
-void irq_remove_debugfs_entry(struct irq_desc *desc);
+static inline void irq_remove_debugfs_entry(struct irq_desc *desc)
+{
+	debugfs_remove(desc->debugfs_file);
+}
 # ifdef CONFIG_IRQ_DOMAIN
 void irq_domain_debugfs_init(struct dentry *root);
 # else

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`*`
`4`	`4`	`* This file is licensed under the GPL V2.`
`5`	`5`	`*/`
`6`		`-#include <linux/debugfs.h>`
`7`	`6`	`#include <linux/irqdomain.h>`
`8`	`7`	`#include <linux/irq.h>`
`9`	`8`
`@@ -191,12 +190,6 @@ void irq_add_debugfs_entry(unsigned int irq, struct irq_desc *desc)`
`191`	`190`	`&dfs_irq_ops);`
`192`	`191`	`}`
`193`	`192`
`194`		`-void irq_remove_debugfs_entry(struct irq_desc *desc)`
`195`		`-{`
`196`		`- if (desc->debugfs_file)`
`197`		`- debugfs_remove(desc->debugfs_file);`
`198`		`-}`
`199`		`-`
`200`	`193`	`static int __init irq_debugfs_init(void)`
`201`	`194`	`{`
`202`	`195`	`struct dentry *root_dir;`