Pull irq fixes from Thomas Gleixner: "A set of irqchip updates: - Make the GENERIC_IRQ_MULTI_HANDLER configuration correct - Add a missing DT compatible string for the Ingenic driver - Remove the pointless debugfs_file pointer from struct irqdomain" * tag 'irq-urgent-2021-03-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip/ingenic: Add support for the JZ4760 dt-bindings/irq: Add compatible string for the JZ4760B irqchip: Do not blindly select CONFIG_GENERIC_IRQ_MULTI_HANDLER ARM: ep93xx: Select GENERIC_IRQ_MULTI_HANDLER directly irqdomain: Remove debugfs_file from struct irq_domain
Showing the changes to kernel (1 of 7 files). Show all
Unified · Split
| @@ -1898,16 +1898,15 @@ DEFINE_SHOW_ATTRIBUTE(irq_domain_debug); · 1897 unmodified lines | |||
| 1898 | 1898 | ||
| 1899 | static void debugfs_add_domain_dir(struct irq_domain *d) | 1899 | static void debugfs_add_domain_dir(struct irq_domain *d) |
| 1900 | { | 1900 | { |
| 1901 | if (!d->name || !domain_dir || d->debugfs_file) | 1901 | if (!d->name || !domain_dir) |
| 1902 | return; | 1902 | return; |
| 1903 | d->debugfs_file = debugfs_create_file(d->name, 0444, domain_dir, d, | 1903 | debugfs_create_file(d->name, 0444, domain_dir, d, |
| 1904 | &irq_domain_debug_fops); | 1904 | &irq_domain_debug_fops); |
| 1905 | } | 1905 | } |
| 1906 | 1906 | ||
| 1907 | static void debugfs_remove_domain_dir(struct irq_domain *d) | 1907 | static void debugfs_remove_domain_dir(struct irq_domain *d) |
| 1908 | { | 1908 | { |
| 1909 | debugfs_remove(d->debugfs_file); | 1909 | debugfs_remove(debugfs_lookup(d->name, domain_dir)); |
| 1910 | d->debugfs_file = NULL; | ||
| 1911 | } | 1910 | } |
| 1912 | 1911 | ||
| 1913 | void __init irq_domain_debugfs_init(struct dentry *root) | 1912 | void __init irq_domain_debugfs_init(struct dentry *root) |