Commit be54f8c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'timers-cleanups-2025-06-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer cleanup from Thomas Gleixner:
 "The delayed from_timer() API cleanup:

  The renaming to the timer_*() namespace was delayed due massive
  conflicts against Linux-next. Now that everything is upstream finish
  the conversion"

* tag 'timers-cleanups-2025-06-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  treewide, timers: Rename from_timer() to timer_container_of()
parents 0529ef8c 41cb0855

arch/alpha/kernel/srmcons.c

+2 −1
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ srmcons_do_receive_chars(struct tty_port *port) 
static void

srmcons_receive_chars(struct timer_list *t)

{

	struct srmcons_private *srmconsp = from_timer(srmconsp, t, timer);

	struct srmcons_private *srmconsp = timer_container_of(srmconsp, t,

							      timer);

	struct tty_port *port = &srmconsp->port;

	unsigned long flags;

	int incr = 10;

arch/powerpc/kvm/booke.c

+1 −1
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ static void arm_next_watchdog(struct kvm_vcpu *vcpu) 


static void kvmppc_watchdog_func(struct timer_list *t)

{

	struct kvm_vcpu *vcpu = from_timer(vcpu, t, arch.wdt_timer);

	struct kvm_vcpu *vcpu = timer_container_of(vcpu, t, arch.wdt_timer);

	u32 tsr, new_tsr;

	int final;

arch/powerpc/platforms/powermac/low_i2c.c

+2 −1
Original line number Diff line number Diff line
@@ -359,7 +359,8 @@ static irqreturn_t kw_i2c_irq(int irq, void *dev_id) 


static void kw_i2c_timeout(struct timer_list *t)

{

	struct pmac_i2c_host_kw *host = from_timer(host, t, timeout_timer);

	struct pmac_i2c_host_kw *host = timer_container_of(host, t,

							   timeout_timer);

	unsigned long flags;



	spin_lock_irqsave(&host->lock, flags);

arch/sh/drivers/heartbeat.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static inline void heartbeat_toggle_bit(struct heartbeat_data *hd, 


static void heartbeat_timer(struct timer_list *t)

{

	struct heartbeat_data *hd = from_timer(hd, t, timer);

	struct heartbeat_data *hd = timer_container_of(hd, t, timer);

	static unsigned bit = 0, up = 1;



	heartbeat_toggle_bit(hd, bit, hd->flags & HEARTBEAT_INVERTED);

arch/sh/drivers/pci/common.c

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ int __init pci_is_66mhz_capable(struct pci_channel *hose, 


static void pcibios_enable_err(struct timer_list *t)

{

	struct pci_channel *hose = from_timer(hose, t, err_timer);

	struct pci_channel *hose = timer_container_of(hose, t, err_timer);



	timer_delete(&hose->err_timer);

	printk(KERN_DEBUG "PCI: re-enabling error IRQ.\n");
@@ -97,7 +97,7 @@ static void pcibios_enable_err(struct timer_list *t) 


static void pcibios_enable_serr(struct timer_list *t)

{

	struct pci_channel *hose = from_timer(hose, t, serr_timer);

	struct pci_channel *hose = timer_container_of(hose, t, serr_timer);



	timer_delete(&hose->serr_timer);

	printk(KERN_DEBUG "PCI: re-enabling system error IRQ.\n");