Commit 136b5721 authored by Tejun Heo's avatar Tejun Heo
Browse files

workqueue: deprecate __cancel_delayed_work() 



Now that cancel_delayed_work() can be safely called from IRQ handlers,
there's no reason to use __cancel_delayed_work().  Use
cancel_delayed_work() instead of __cancel_delayed_work() and mark the
latter deprecated.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarJens Axboe <axboe@kernel.dk>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Roland Dreier <roland@kernel.org>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
parent 57b30ae7

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ EXPORT_SYMBOL(blk_start_queue); 
 **/

void blk_stop_queue(struct request_queue *q)

{

	__cancel_delayed_work(&q->delay_work);

	cancel_delayed_work(&q->delay_work);

	queue_flag_set(QUEUE_FLAG_STOPPED, q);

}

EXPORT_SYMBOL(blk_stop_queue);

drivers/block/floppy.c

+1 −1
Original line number Diff line number Diff line
@@ -890,7 +890,7 @@ static void unlock_fdc(void) 


	raw_cmd = NULL;

	command_status = FD_COMMAND_NONE;

	__cancel_delayed_work(&fd_timeout);

	cancel_delayed_work(&fd_timeout);

	do_floppy = NULL;

	cont = NULL;

	clear_bit(0, &fdc_busy);

drivers/infiniband/core/mad.c

+1 −1
Original line number Diff line number Diff line
@@ -2004,7 +2004,7 @@ static void adjust_timeout(struct ib_mad_agent_private *mad_agent_priv) 
	unsigned long delay;



	if (list_empty(&mad_agent_priv->wait_list)) {

		__cancel_delayed_work(&mad_agent_priv->timed_work);

		cancel_delayed_work(&mad_agent_priv->timed_work);

	} else {

		mad_send_wr = list_entry(mad_agent_priv->wait_list.next,

					 struct ib_mad_send_wr_private,

drivers/video/omap2/dss/dsi.c

+1 −1
Original line number Diff line number Diff line
@@ -4306,7 +4306,7 @@ static void dsi_framedone_irq_callback(void *data, u32 mask) 
	 * and is sending the data.

	 */



	__cancel_delayed_work(&dsi->framedone_timeout_work);

	cancel_delayed_work(&dsi->framedone_timeout_work);



	dsi_handle_framedone(dsidev, 0);

}

include/linux/workqueue.h

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ extern unsigned int work_busy(struct work_struct *work); 
 * if it returns 0 the timer function may be running and the queueing is in

 * progress.

 */

static inline bool __cancel_delayed_work(struct delayed_work *work)

static inline bool __deprecated __cancel_delayed_work(struct delayed_work *work)

{

	bool ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE