treewide, timers: Rename destroy_timer_on_stack() as timer_destroy_on_stack()

Move this API to the canonical timer_*() namespace.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250507175338.672442-10-mingo@kernel.org

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index c8b0a9e29ed843ca04c6fc2ee2672fdbbfdf0937..95f51a7174c739ed30fcb98e028717a5067847da 100644 (file)
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -560,7 +560,7 @@ static void dpm_watchdog_clear(struct dpm_watchdog *wd)
        struct timer_list *timer = &wd->timer;
 
        timer_delete_sync(timer);
-       destroy_timer_on_stack(timer);
+       timer_destroy_on_stack(timer);
 }
 #else
 #define DECLARE_DPM_WATCHDOG_ON_STACK(wd)

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 4ea4dccc7c46b042b504c218cb29ad08aa6cc5b4..e53033133bb376370d70ae91e02f118bde0c5d4a 100644 (file)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1353,7 +1353,7 @@ static void __cold try_to_generate_entropy(void)
        mix_pool_bytes(&stack->entropy, sizeof(stack->entropy));
 
        timer_delete_sync(&stack->timer);
-       destroy_timer_on_stack(&stack->timer);
+       timer_destroy_on_stack(&stack->timer);
 }
 
 

diff --git a/drivers/dma-buf/st-dma-fence.c b/drivers/dma-buf/st-dma-fence.c
index 9f80a45498f033b8499906ddd204424f948755b6..261b388162264779e00d59ba4c9563de9b157ae8 100644 (file)
--- a/drivers/dma-buf/st-dma-fence.c
+++ b/drivers/dma-buf/st-dma-fence.c
@@ -413,7 +413,7 @@ static int test_wait_timeout(void *arg)
        err = 0;
 err_free:
        timer_delete_sync(&wt.timer);
-       destroy_timer_on_stack(&wt.timer);
+       timer_destroy_on_stack(&wt.timer);
        dma_fence_signal(wt.f);
        dma_fence_put(wt.f);
        return err;

diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
index b0f9ef6ac6dfb33e15b52efe19aaa7550c12ba24..18cacb9edbbce47750b21f3700b6f666a01b1861 100644 (file)
--- a/drivers/firewire/core-transaction.c
+++ b/drivers/firewire/core-transaction.c
@@ -431,7 +431,7 @@ int fw_run_transaction(struct fw_card *card, int tcode, int destination_id,
        fw_send_request(card, &t, tcode, destination_id, generation, speed,
                        offset, payload, length, transaction_callback, &d);
        wait_for_completion(&d.done);
-       destroy_timer_on_stack(&t.split_timeout_timer);
+       timer_destroy_on_stack(&t.split_timeout_timer);
 
        return d.rcode;
 }

diff --git a/drivers/firmware/psci/psci_checker.c b/drivers/firmware/psci/psci_checker.c
index b662b7e28b80ec9ad6629de29f63c98f2d18bf48..df02a4ec339851c56d7d3d22ad404533dac17f90 100644 (file)
--- a/drivers/firmware/psci/psci_checker.c
+++ b/drivers/firmware/psci/psci_checker.c
@@ -343,7 +343,7 @@ static int suspend_test_thread(void *arg)
         * later.
         */
        timer_delete(&wakeup_timer);
-       destroy_timer_on_stack(&wakeup_timer);
+       timer_destroy_on_stack(&wakeup_timer);
 
        if (atomic_dec_return_relaxed(&nb_active_threads) == 0)
                complete(&suspend_threads_done);

diff --git a/drivers/gpu/drm/gud/gud_pipe.c b/drivers/gpu/drm/gud/gud_pipe.c
index 77cfcf37ddd2ee58a492247361f84886fae3ae2b..feff73cc0005dad9f68a437b7e1a40b35639af8f 100644 (file)
--- a/drivers/gpu/drm/gud/gud_pipe.c
+++ b/drivers/gpu/drm/gud/gud_pipe.c
@@ -261,7 +261,7 @@ static int gud_usb_bulk(struct gud_device *gdrm, size_t len)
        else if (ctx.sgr.bytes != len)
                ret = -EIO;
 
-       destroy_timer_on_stack(&ctx.timer);
+       timer_destroy_on_stack(&ctx.timer);
 
        return ret;
 }

diff --git a/drivers/gpu/drm/i915/gt/selftest_migrate.c b/drivers/gpu/drm/i915/gt/selftest_migrate.c
index 401bee030dbcf774f4f2b2188873914e18a71fbc..32c762eb79edd5c7bdb0c6b80547b596e903dcbf 100644 (file)
--- a/drivers/gpu/drm/i915/gt/selftest_migrate.c
+++ b/drivers/gpu/drm/i915/gt/selftest_migrate.c
@@ -661,7 +661,7 @@ static int live_emit_pte_full_ring(void *arg)
 out_rq:
        i915_request_add(rq); /* GEM_BUG_ON(rq->reserved_space > ring->space)? */
        timer_delete_sync(&st.timer);
-       destroy_timer_on_stack(&st.timer);
+       timer_destroy_on_stack(&st.timer);
 out_unpin:
        intel_context_unpin(ce);
 out_put:

diff --git a/drivers/gpu/drm/i915/selftests/lib_sw_fence.c b/drivers/gpu/drm/i915/selftests/lib_sw_fence.c
index d5ecc68155da3ae772f9a51446fcbff4779d17cb..522ad49406ce267abe60a9832fbe943a6cd888d3 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/lib_sw_fence.c
+++ b/drivers/gpu/drm/i915/selftests/lib_sw_fence.c
@@ -77,7 +77,7 @@ void timed_fence_fini(struct timed_fence *tf)
        if (timer_delete_sync(&tf->timer))
                i915_sw_fence_commit(&tf->fence);
 
-       destroy_timer_on_stack(&tf->timer);
+       timer_destroy_on_stack(&tf->timer);
        i915_sw_fence_fini(&tf->fence);
 }
 

diff --git a/drivers/gpu/drm/ttm/tests/ttm_bo_test.c b/drivers/gpu/drm/ttm/tests/ttm_bo_test.c
index f8f20d2f61740f59a1558ff196a5d40f33504239..f24866823d95aab8b7da689abb39e44bfa8cda21 100644 (file)
--- a/drivers/gpu/drm/ttm/tests/ttm_bo_test.c
+++ b/drivers/gpu/drm/ttm/tests/ttm_bo_test.c
@@ -201,7 +201,7 @@ static int threaded_ttm_bo_reserve(void *arg)
        err = ttm_bo_reserve(bo, interruptible, no_wait, &ctx);
 
        timer_delete_sync(&s_timer.timer);
-       destroy_timer_on_stack(&s_timer.timer);
+       timer_destroy_on_stack(&s_timer.timer);
 
        ww_acquire_fini(&ctx);
 

diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
index 9a583eeaa329a87dc70c333fdfe47f0ac898dd12..e23b0de1e0aabb25b5a19f5b0defa178690d8096 100644 (file)
--- a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
@@ -3806,7 +3806,7 @@ status);
        if ((status < 0) && (!probe_fl)) {
                pvr2_hdw_render_useless(hdw);
        }
-       destroy_timer_on_stack(&timer.timer);
+       timer_destroy_on_stack(&timer.timer);
 
        return status;
 }

diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index d533a8aa72ccd7fe6a693e9d111248e600f17efc..b75f46c30759daf3a2a5ac77f5ab8b3e77c2bf57 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -3952,7 +3952,7 @@ megaraid_sysfs_get_ldmap(adapter_t *adapter)
 
 
        timer_delete_sync(&timeout.timer);
-       destroy_timer_on_stack(&timeout.timer);
+       timer_destroy_on_stack(&timeout.timer);
 
        mutex_unlock(&raid_dev->sysfs_mtx);
 

diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index 1f2cd15e336165c0f547ef0b1b9bd9a6a7e45da3..fd7fa7640a5ea9eb47e715ecb80c4c5f094af272 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -704,7 +704,7 @@ lld_ioctl(mraid_mmadp_t *adp, uioc_t *kioc)
        wait_event(wait_q, (kioc->status != -ENODATA));
        if (timeout.timer.function) {
                timer_delete_sync(&timeout.timer);
-               destroy_timer_on_stack(&timeout.timer);
+               timer_destroy_on_stack(&timeout.timer);
        }
 
        /*

diff --git a/drivers/staging/gpib/common/iblib.c b/drivers/staging/gpib/common/iblib.c
index b297261818f2120d6c7f04bc6e08168f40337653..432540e1bc9af871797000f926b8d8c537b6fb14 100644 (file)
--- a/drivers/staging/gpib/common/iblib.c
+++ b/drivers/staging/gpib/common/iblib.c
@@ -611,7 +611,7 @@ static void start_wait_timer(struct wait_info *winfo)
 static void remove_wait_timer(struct wait_info *winfo)
 {
        timer_delete_sync(&winfo->timer);
-       destroy_timer_on_stack(&winfo->timer);
+       timer_destroy_on_stack(&winfo->timer);
 }
 
 /*

diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index c6b9ad12e8fe071c8c2d4cfd4cf554119ecb2b84..b7f940486414ac9c08aa3a5944f2e02384ce416d 100644 (file)
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -598,7 +598,7 @@ static int cxacru_start_wait_urb(struct urb *urb, struct completion *done,
        mod_timer(&timer.timer, jiffies + msecs_to_jiffies(CMD_TIMEOUT));
        wait_for_completion(done);
        timer_delete_sync(&timer.timer);
-       destroy_timer_on_stack(&timer.timer);
+       timer_destroy_on_stack(&timer.timer);
 
        if (actual_length)
                *actual_length = urb->actual_length;

diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 853a5f082a70c85281f1f2d9547939d47cef9cf8..7c2041f61cde62f9f80ef4d6ca91f72e8c7126c6 100644 (file)
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -630,7 +630,7 @@ static int perform_sglist(
                        retval = -ETIMEDOUT;
                else
                        retval = req->status;
-               destroy_timer_on_stack(&timeout.timer);
+               timer_destroy_on_stack(&timeout.timer);
 
                /* FIXME check resulting data pattern */
 

diff --git a/fs/bcachefs/clock.c b/fs/bcachefs/clock.c
index d6dd12d74d4f6cc1d20f1c786bc2e0a5f5a913f2..f57f9f4774e6c2d4b7effd4e3e0b4dd8aa2c2705 100644 (file)
--- a/fs/bcachefs/clock.c
+++ b/fs/bcachefs/clock.c
@@ -122,7 +122,7 @@ void bch2_kthread_io_clock_wait(struct io_clock *clock,
 
        __set_current_state(TASK_RUNNING);
        timer_delete_sync(&wait.cpu_timer);
-       destroy_timer_on_stack(&wait.cpu_timer);
+       timer_destroy_on_stack(&wait.cpu_timer);
        bch2_io_timer_del(clock, &wait.io_timer);
 }
 

diff --git a/include/linux/timer.h b/include/linux/timer.h
index 5b6ff90fcf813fb9c33d92edd3f107599eeecaf9..7b53043a2d251c13008fbe24be4480b217d7d4a5 100644 (file)
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -115,7 +115,7 @@ static inline void timer_init_key_on_stack(struct timer_list *timer,
  *
  * Regular timer initialization should use either DEFINE_TIMER() above,
  * or timer_setup(). For timers on the stack, timer_setup_on_stack() must
- * be used and must be balanced with a call to destroy_timer_on_stack().
+ * be used and must be balanced with a call to timer_destroy_on_stack().
  */
 #define timer_setup(timer, callback, flags)                    \
        __timer_init((timer), (callback), (flags))
@@ -124,9 +124,9 @@ static inline void timer_init_key_on_stack(struct timer_list *timer,
        __timer_init_on_stack((timer), (callback), (flags))
 
 #ifdef CONFIG_DEBUG_OBJECTS_TIMERS
-extern void destroy_timer_on_stack(struct timer_list *timer);
+extern void timer_destroy_on_stack(struct timer_list *timer);
 #else
-static inline void destroy_timer_on_stack(struct timer_list *timer) { }
+static inline void timer_destroy_on_stack(struct timer_list *timer) { }
 #endif
 
 #define from_timer(var, callback_timer, timer_fieldname) \

diff --git a/kernel/kcsan/kcsan_test.c b/kernel/kcsan/kcsan_test.c
index 6ce73cceaf535e7e5ed6779da5e3e486c2c7ea28..c2871180edccc1c8dd121b1cded8d34a9648af56 100644 (file)
--- a/kernel/kcsan/kcsan_test.c
+++ b/kernel/kcsan/kcsan_test.c
@@ -1501,7 +1501,7 @@ static int access_thread(void *arg)
                }
        } while (!torture_must_stop());
        timer_delete_sync(&timer);
-       destroy_timer_on_stack(&timer);
+       timer_destroy_on_stack(&timer);
 
        torture_kthread_stopping("access_thread");
        return 0;

diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index 4fa7772be183187394b4e8935f7caff53d8525be..f3f1bc86fbea8a10c0e65a60716661f58d6f8d1d 100644 (file)
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -2325,7 +2325,7 @@ rcu_torture_reader(void *arg)
        } while (!torture_must_stop());
        if (irqreader && cur_ops->irq_capable) {
                timer_delete_sync(&t);
-               destroy_timer_on_stack(&t);
+               timer_destroy_on_stack(&t);
        }
        tick_dep_clear_task(current, TICK_DEP_BIT_RCU);
        torture_kthread_stopping("rcu_torture_reader");

diff --git a/kernel/time/sleep_timeout.c b/kernel/time/sleep_timeout.c
index c0e960a5de39dc01ced64196220f14f34d4179c7..5aa38b2cf40a7216c1ee6a1cb660111222260b03 100644 (file)
--- a/kernel/time/sleep_timeout.c
+++ b/kernel/time/sleep_timeout.c
@@ -100,7 +100,7 @@ signed long __sched schedule_timeout(signed long timeout)
        timer_delete_sync(&timer.timer);
 
        /* Remove the timer from the object tracker */
-       destroy_timer_on_stack(&timer.timer);
+       timer_destroy_on_stack(&timer.timer);
 
        timeout = expire - jiffies;
 

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 836ba00690bb3b84bceea280c4d3927dd35e44cb..007b30fc383b1b221894c5e78bfb7d08f1bcc168 100644 (file)
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -860,11 +860,11 @@ void timer_init_key_on_stack(struct timer_list *timer,
 }
 EXPORT_SYMBOL_GPL(timer_init_key_on_stack);
 
-void destroy_timer_on_stack(struct timer_list *timer)
+void timer_destroy_on_stack(struct timer_list *timer)
 {
        debug_object_free(timer, &timer_debug_descr);
 }
-EXPORT_SYMBOL_GPL(destroy_timer_on_stack);
+EXPORT_SYMBOL_GPL(timer_destroy_on_stack);
 
 #else
 static inline void debug_timer_init(struct timer_list *timer) { }

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index cf620328273757e4e9a06f8f29ca7ead436db47b..9e6cf45f0972ac5d7a2521aa36537bcaa42a9895 100644 (file)
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -686,7 +686,7 @@ EXPORT_SYMBOL_GPL(destroy_work_on_stack);
 
 void destroy_delayed_work_on_stack(struct delayed_work *work)
 {
-       destroy_timer_on_stack(&work->timer);
+       timer_destroy_on_stack(&work->timer);
        debug_object_free(&work->work, &work_debug_descr);
 }
 EXPORT_SYMBOL_GPL(destroy_delayed_work_on_stack);