public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] irqdomain: remove debugfs_file from struct irq_domain
@ 2021-02-16 14:36 Greg Kroah-Hartman
  2021-02-16 15:36 ` [irqchip: irq/irqchip-next] irqdomain: Remove " irqchip-bot for Greg Kroah-Hartman
                   ` (3 more replies)
  0 siblings, 4 replies; 23+ messages in thread
From: Greg Kroah-Hartman @ 2021-02-16 14:36 UTC (permalink / raw)
  To: Marc Zyngier, Thomas Gleixner; +Cc: linux-kernel

There's no need to keep around a dentry pointer to a simple file that
debugfs itself can look up when we need to remove it from the system.
So simplify the code by deleting the variable and cleaning up the logic
around the debugfs file.

Cc: Marc Zyngier <maz@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 include/linux/irqdomain.h | 4 ----
 kernel/irq/irqdomain.c    | 9 ++++-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index 42d196805f58..33cacc8af26d 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -150,7 +150,6 @@ struct irq_domain_chip_generic;
  *      setting up one or more generic chips for interrupt controllers
  *      drivers using the generic chip library which uses this pointer.
  * @parent: Pointer to parent irq_domain to support hierarchy irq_domains
- * @debugfs_file: dentry for the domain debugfs file
  *
  * Revmap data, used internally by irq_domain
  * @revmap_direct_max_irq: The largest hwirq that can be set for controllers that
@@ -174,9 +173,6 @@ struct irq_domain {
 #ifdef	CONFIG_IRQ_DOMAIN_HIERARCHY
 	struct irq_domain *parent;
 #endif
-#ifdef CONFIG_GENERIC_IRQ_DEBUGFS
-	struct dentry		*debugfs_file;
-#endif
 
 	/* reverse map data. The linear map gets appended to the irq_domain */
 	irq_hw_number_t hwirq_max;
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 6aacd342cd14..367ff1c35f75 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -1896,16 +1896,15 @@ DEFINE_SHOW_ATTRIBUTE(irq_domain_debug);
 
 static void debugfs_add_domain_dir(struct irq_domain *d)
 {
-	if (!d->name || !domain_dir || d->debugfs_file)
+	if (!d->name || !domain_dir)
 		return;
-	d->debugfs_file = debugfs_create_file(d->name, 0444, domain_dir, d,
-					      &irq_domain_debug_fops);
+	debugfs_create_file(d->name, 0444, domain_dir, d,
+			    &irq_domain_debug_fops);
 }
 
 static void debugfs_remove_domain_dir(struct irq_domain *d)
 {
-	debugfs_remove(d->debugfs_file);
-	d->debugfs_file = NULL;
+	debugfs_remove(debugfs_lookup(d->name, domain_dir));
 }
 
 void __init irq_domain_debugfs_init(struct dentry *root)
-- 
2.30.1


^ permalink raw reply related	[flat|nested] 23+ messages in thread
end of thread, other threads:[~2021-03-08 20:26 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-16 14:36 [PATCH] irqdomain: remove debugfs_file from struct irq_domain Greg Kroah-Hartman
2021-02-16 15:36 ` [irqchip: irq/irqchip-next] irqdomain: Remove " irqchip-bot for Greg Kroah-Hartman
2021-02-17 19:57 ` [PATCH] irqdomain: remove " Michael Walle
2021-02-17 20:02   ` Marc Zyngier
2021-02-17 20:10     ` Michael Walle
2021-02-17 21:50       ` Marc Zyngier
2021-02-17 22:21         ` Michael Walle
2021-02-18  7:16           ` Greg KH
2021-02-18  7:31         ` Greg KH
2021-02-18  8:27           ` Michael Walle
2021-02-18  8:38             ` Greg KH
2021-02-18  8:47               ` Marc Zyngier
2021-02-18  8:54                 ` Greg KH
2021-02-18  9:04                   ` Marc Zyngier
2021-02-18  9:38                     ` Greg KH
2021-02-18 10:39                       ` Marc Zyngier
2021-02-18  8:52             ` Greg KH
2021-02-18  9:04               ` Michael Walle
2021-02-18  9:08               ` Marc Zyngier
2021-02-18  8:40   ` Greg KH
2021-02-18  8:46     ` Michael Walle
2021-02-18 11:43 ` [irqchip: irq/irqchip-next] irqdomain: Remove " irqchip-bot for Greg Kroah-Hartman
2021-03-08 20:25 ` irqchip-bot for Greg Kroah-Hartman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox