History

Merge tag 'irq-urgent-2021-03-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

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

Linus Torvalds committed 5 years ago

Commit 70404fe2 parents 802b31c b470ebc7 files · +8 −18Browse files

Showing the changes to kernel (1 of 7 files). Show all

Unified · Split

kernel/irq/irqdomain.c+4−5
@@ -1898,16 +1898,15 @@ DEFINE_SHOW_ATTRIBUTE(irq_domain_debug); · 1897 unmodified lines
18981898
18991899 static void debugfs_add_domain_dir(struct irq_domain *d)
19001900 {
1901− if (!d->name || !domain_dir || d->debugfs_file)
1901+ if (!d->name || !domain_dir)
19021902 return;
1903− d->debugfs_file = debugfs_create_file(d->name, 0444, domain_dir, d,
1904− &irq_domain_debug_fops);
1903+ debugfs_create_file(d->name, 0444, domain_dir, d,
1904+ &irq_domain_debug_fops);
19051905 }
19061906
19071907 static void debugfs_remove_domain_dir(struct irq_domain *d)
19081908 {
1909− debugfs_remove(d->debugfs_file);
1910− d->debugfs_file = NULL;
1909+ debugfs_remove(debugfs_lookup(d->name, domain_dir));
19111910 }
19121911
19131912 void __init irq_domain_debugfs_init(struct dentry *root)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t