treewide: Remove in_irq()

This old alias for in_hardirq() has been marked as deprecated since
2020; remove the stragglers.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://patch.msgid.link/20251024180654.1691095-1-willy@infradead.org

diff --git a/drivers/bus/fsl-mc/mc-sys.c b/drivers/bus/fsl-mc/mc-sys.c
index b22c59d57c8f0a7c037f08cfd7ddb9124305995e..31037f41893e3a78ce465a7ac3957d2014c658c2 100644 (file)
--- a/drivers/bus/fsl-mc/mc-sys.c
+++ b/drivers/bus/fsl-mc/mc-sys.c
@@ -248,7 +248,7 @@ int mc_send_command(struct fsl_mc_io *mc_io, struct fsl_mc_command *cmd)
        enum mc_cmd_status status;
        unsigned long irq_flags = 0;
 
-       if (in_irq() && !(mc_io->flags & FSL_MC_IO_ATOMIC_CONTEXT_PORTAL))
+       if (in_hardirq() && !(mc_io->flags & FSL_MC_IO_ATOMIC_CONTEXT_PORTAL))
                return -EINVAL;
 
        if (mc_io->flags & FSL_MC_IO_ATOMIC_CONTEXT_PORTAL)

diff --git a/drivers/md/dm-vdo/logger.c b/drivers/md/dm-vdo/logger.c
index 3f7dc2cb6b9854d3e3fa8245b51779a17ea622c3..76a987ccf92602e6d5a346a81b7352d16af690bd 100644 (file)
--- a/drivers/md/dm-vdo/logger.c
+++ b/drivers/md/dm-vdo/logger.c
@@ -34,7 +34,7 @@ static const char *get_current_interrupt_type(void)
        if (in_nmi())
                return "NMI";
 
-       if (in_irq())
+       if (in_hardirq())
                return "HI";
 
        if (in_softirq())

diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 67964dc4db952ea11d4b88554383ea0ec5946ef9..dd634103b014ed8f98f25a1ad4416faf1734e95d 100644 (file)
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -616,7 +616,7 @@ do {                                                                        \
 #define lockdep_assert_in_softirq()                                    \
 do {                                                                   \
        WARN_ON_ONCE(__lockdep_enabled                  &&              \
-                    (!in_softirq() || in_irq() || in_nmi()));          \
+                    (!in_softirq() || in_hardirq() || in_nmi()));      \
 } while (0)
 
 extern void lockdep_assert_in_softirq_func(void);

diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index 102202185d7a2c27387d1713c4ad089101b4f13f..d964f965c8ffc2b90ef5c5cf60ff157ad2f1888c 100644 (file)
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -134,11 +134,9 @@ static __always_inline unsigned char interrupt_context_level(void)
 
 /*
  * The following macros are deprecated and should not be used in new code:
- * in_irq()       - Obsolete version of in_hardirq()
  * in_softirq()   - We have BH disabled, or are processing softirqs
  * in_interrupt() - We're in NMI,IRQ,SoftIRQ context or have BH disabled
  */
-#define in_irq()               (hardirq_count())
 #define in_softirq()           (softirq_count())
 #define in_interrupt()         (irq_count())
 

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 8a129746bd6cc77c3eea8ce5abd500f99a81326c..6cde6a46babf0b5c5919cf65105decb9b37b152d 100644 (file)
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -2330,7 +2330,7 @@ static void bpf_audit_prog(const struct bpf_prog *prog, unsigned int op)
                return;
        if (audit_enabled == AUDIT_OFF)
                return;
-       if (!in_irq() && !irqs_disabled())
+       if (!in_hardirq() && !irqs_disabled())
                ctx = audit_context();
        ab = audit_log_start(ctx, GFP_ATOMIC, AUDIT_BPF);
        if (unlikely(!ab))
@@ -2428,7 +2428,7 @@ static void __bpf_prog_put(struct bpf_prog *prog)
        struct bpf_prog_aux *aux = prog->aux;
 
        if (atomic64_dec_and_test(&aux->refcnt)) {
-               if (in_irq() || irqs_disabled()) {
+               if (in_hardirq() || irqs_disabled()) {
                        INIT_WORK(&aux->work, bpf_prog_put_deferred);
                        schedule_work(&aux->work);
                } else {

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 553fa469d7ccfb0b98641d128c5e161588c79f54..282a8e5c05f8e068cdb381ace80953bac4b1e731 100644 (file)
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -2472,7 +2472,7 @@ void update_process_times(int user_tick)
        run_local_timers();
        rcu_sched_clock_irq(user_tick);
 #ifdef CONFIG_IRQ_WORK
-       if (in_irq())
+       if (in_hardirq())
                irq_work_tick();
 #endif
        sched_tick();

diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
index ed99344317f50d9d9d3e12b740e418cd94117709..d939403331b5a60af529202710a98ebab999d8bb 100644 (file)
--- a/lib/locking-selftest.c
+++ b/lib/locking-selftest.c
@@ -202,7 +202,7 @@ static void init_shared_classes(void)
        local_irq_disable();                    \
        __irq_enter();                          \
        lockdep_hardirq_threaded();             \
-       WARN_ON(!in_irq());
+       WARN_ON(!in_hardirq());
 
 #define HARDIRQ_EXIT()                         \
        __irq_exit();                           \
@@ -2512,7 +2512,7 @@ DEFINE_LOCK_GUARD_0(NOTTHREADED_HARDIRQ,
        do {
                local_irq_disable();
                __irq_enter();
-               WARN_ON(!in_irq());
+               WARN_ON(!in_hardirq());
        } while(0), HARDIRQ_EXIT())
 DEFINE_LOCK_GUARD_0(SOFTIRQ, SOFTIRQ_ENTER(), SOFTIRQ_EXIT())