lkml.org 
[lkml]   [2012]   [Aug]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 7/7] workqueue: deprecate __cancel_delayed_work()
    Date
    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 <tj@kernel.org>
    Cc: Jens Axboe <axboe@kernel.dk>
    Cc: Jiri Kosina <jkosina@suse.cz>
    Cc: Roland Dreier <roland@kernel.org>
    Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
    ---
    block/blk-core.c | 2 +-
    drivers/block/floppy.c | 2 +-
    drivers/infiniband/core/mad.c | 2 +-
    drivers/video/omap2/dss/dsi.c | 2 +-
    include/linux/workqueue.h | 2 +-
    5 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/block/blk-core.c b/block/blk-core.c
    index 4b8b606..dc04a90 100644
    --- 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 55a5bc0..17c675c 100644
    --- 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 b593814..dc3fd1e 100644
    --- 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 fd40f26..05ee046 100644
    --- 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 6306157..6cd8f91 100644
    --- a/include/linux/workqueue.h
    +++ b/include/linux/workqueue.h
    @@ -431,7 +431,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;

    --
    1.7.7.3


    \
     
     \ /
      Last update: 2012-08-09 00:21    [W:3.100 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site