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: Tejun Heo <[email protected]>
Acked-by: Jens Axboe <[email protected]>
Cc: Jiri Kosina <[email protected]>
Cc: Roland Dreier <[email protected]>
Cc: Tomi Valkeinen <[email protected]>

diff --git a/block/blk-core.c b/block/blk-core.c
index 4b8b606dbb01805c2e1f3393ace97558b22f9a46..dc04a9013027435efaaac8c99ab05c05b4e53d59 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -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);

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 55a5bc002c069a708fd6f0de38177a22ead5f4db..17c675c522954cc39a210e431603aac2a3a2d946 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -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);

diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index b5938147fc898c4350ef408052782d1d7307c586..dc3fd1e8af07f0f8f4c6da455c38e315074a8e1e 100644 (file)
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -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,

diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index fd40f2625051bd0db3a275fdcf5d1ed98be66a37..05ee04667af1bdca019c8d4be15b78ce3d421b0f 100644 (file)
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -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);
 }

diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 4898289564abbc6ff6d899750be20b859e813615..2b58905d3504f71f71bb7636f2e195c80090c577 100644 (file)
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -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;