[PATCH 1/2] genirq: proc: drop unused argument from unregister_handler_proc()

From: Bartosz Golaszewski
Date: Mon Aug 14 2023 - 05:37:33 EST


From: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>

The irq argument is unused. Drop it.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>
---
kernel/irq/internals.h | 5 ++---
kernel/irq/manage.c | 6 +++---
kernel/irq/proc.c | 2 +-
3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
index bdd35bb9c735..eee0e27e6750 100644
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
@@ -125,14 +125,13 @@ void __irq_wake_thread(struct irq_desc *desc, struct irqaction *action);
extern void register_irq_proc(unsigned int irq, struct irq_desc *desc);
extern void unregister_irq_proc(unsigned int irq, struct irq_desc *desc);
extern void register_handler_proc(unsigned int irq, struct irqaction *action);
-extern void unregister_handler_proc(unsigned int irq, struct irqaction *action);
+extern void unregister_handler_proc(struct irqaction *action);
#else
static inline void register_irq_proc(unsigned int irq, struct irq_desc *desc) { }
static inline void unregister_irq_proc(unsigned int irq, struct irq_desc *desc) { }
static inline void register_handler_proc(unsigned int irq,
struct irqaction *action) { }
-static inline void unregister_handler_proc(unsigned int irq,
- struct irqaction *action) { }
+static inline void unregister_handler_proc(struct irqaction *action) { }
#endif

extern bool irq_can_set_affinity_usr(unsigned int irq);
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index d2742af0f0fd..7ed8a151ded8 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1937,7 +1937,7 @@ static struct irqaction *__free_irq(struct irq_desc *desc, void *dev_id)
*/
chip_bus_sync_unlock(desc);

- unregister_handler_proc(irq, action);
+ unregister_handler_proc(action);

/*
* Make sure it's not being used on another CPU and if the chip
@@ -2056,7 +2056,7 @@ static const void *__cleanup_nmi(unsigned int irq, struct irq_desc *desc)
if (!WARN_ON(desc->action == NULL)) {
irq_pm_remove_action(desc, desc->action);
devname = desc->action->name;
- unregister_handler_proc(irq, desc->action);
+ unregister_handler_proc(desc->action);

kfree(desc->action);
desc->action = NULL;
@@ -2487,7 +2487,7 @@ static struct irqaction *__free_percpu_irq(unsigned int irq, void __percpu *dev_

raw_spin_unlock_irqrestore(&desc->lock, flags);

- unregister_handler_proc(irq, action);
+ unregister_handler_proc(action);

irq_chip_pm_put(&desc->irq_data);
module_put(desc->owner);
diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c
index 623b8136e9af..83ed403991c6 100644
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
@@ -414,7 +414,7 @@ void unregister_irq_proc(unsigned int irq, struct irq_desc *desc)

#undef MAX_NAMELEN

-void unregister_handler_proc(unsigned int irq, struct irqaction *action)
+void unregister_handler_proc(struct irqaction *action)
{
proc_remove(action->dir);
}
--
2.39.2