Commit 53bf837b authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

timers: Remove set_timer_slack() leftovers 



We now have implicit batching in the timer wheel. The slack API is no longer
used, so remove it.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Andrew F. Davis <afd@ti.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Chris Mason <clm@fb.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: George Spelvin <linux@sciencehorizons.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Len Brown <lenb@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mathias Nyman <mathias.nyman@intel.com>
Cc: Pali Rohár <pali.rohar@gmail.com>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Sebastian Reichel <sre@kernel.org>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: linux-block@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-mmc@vger.kernel.org
Cc: linux-pm@vger.kernel.org
Cc: linux-usb@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: rt@linutronix.de
Link: http://lkml.kernel.org/r/20160704094342.189813118@linutronix.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 500462a9

block/genhd.c

+0 −5
Original line number Diff line number Diff line
@@ -1523,12 +1523,7 @@ static void __disk_unblock_events(struct gendisk *disk, bool check_now) 
	if (--ev->block)

		goto out_unlock;



	/*

	 * Not exactly a latency critical operation, set poll timer

	 * slack to 25% and kick event check.

	 */

	intv = disk_events_poll_jiffies(disk);

	set_timer_slack(&ev->dwork.timer, intv / 4);

	if (check_now)

		queue_delayed_work(system_freezable_power_efficient_wq,

				&ev->dwork, 0);

drivers/mmc/host/jz4740_mmc.c

+0 −2
Original line number Diff line number Diff line
@@ -1068,8 +1068,6 @@ static int jz4740_mmc_probe(struct platform_device* pdev) 
	jz4740_mmc_clock_disable(host);

	setup_timer(&host->timeout_timer, jz4740_mmc_timeout,

			(unsigned long)host);

	/* It is not important when it times out, it just needs to timeout. */

	set_timer_slack(&host->timeout_timer, HZ);



	host->use_dma = true;

	if (host->use_dma && jz4740_mmc_acquire_dma_channels(host) != 0)

drivers/power/bq27xxx_battery.c

+1 −4
Original line number Diff line number Diff line
@@ -735,12 +735,9 @@ static void bq27xxx_battery_poll(struct work_struct *work) 


	bq27xxx_battery_update(di);



	if (poll_interval > 0) {

		/* The timer does not have to be accurate. */

		set_timer_slack(&di->work.timer, poll_interval * HZ / 4);

	if (poll_interval > 0)

		schedule_delayed_work(&di->work, poll_interval * HZ);

}

}



/*

 * Return the battery average current in µA

drivers/usb/host/ohci-hcd.c

+0 −1
Original line number Diff line number Diff line
@@ -500,7 +500,6 @@ static int ohci_init (struct ohci_hcd *ohci) 


	setup_timer(&ohci->io_watchdog, io_watchdog_func,

			(unsigned long) ohci);

	set_timer_slack(&ohci->io_watchdog, msecs_to_jiffies(20));



	ohci->hcca = dma_alloc_coherent (hcd->self.controller,

			sizeof(*ohci->hcca), &ohci->hcca_dma, GFP_KERNEL);

drivers/usb/host/xhci.c

+0 −2
Original line number Diff line number Diff line
@@ -490,8 +490,6 @@ static void compliance_mode_recovery_timer_init(struct xhci_hcd *xhci) 
	xhci->comp_mode_recovery_timer.expires = jiffies +

			msecs_to_jiffies(COMP_MODE_RCVRY_MSECS);



	set_timer_slack(&xhci->comp_mode_recovery_timer,

			msecs_to_jiffies(COMP_MODE_RCVRY_MSECS));

	add_timer(&xhci->comp_mode_recovery_timer);

	xhci_dbg_trace(xhci, trace_xhci_dbg_quirks,

			"Compliance mode recovery timer initialized");

CRA Git | Maintained and supported by SUSTech CRA and CCSE