diff mbox

[media] coda: Do not use __cancel_delayed_work()

Message ID 1349840009-14014-1-git-send-email-festevam@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Fabio Estevam Oct. 10, 2012, 3:33 a.m. UTC 
From: Fabio Estevam <fabio.estevam@freescale.com>

commit 136b5721d (workqueue: deprecate __cancel_delayed_work()) made 
__cancel_delayed_work deprecated. Use cancel_delayed_work instead and get rid of
the following warning: 

drivers/media/platform/coda.c:1543: warning: '__cancel_delayed_work' is deprecated (declared at include/linux/workqueue.h:437)

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/media/platform/coda.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tejun Heo Oct. 10, 2012, 3:43 a.m. UTC | #1 
On Wed, Oct 10, 2012 at 12:33:29AM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> commit 136b5721d (workqueue: deprecate __cancel_delayed_work()) made 
> __cancel_delayed_work deprecated. Use cancel_delayed_work instead and get rid of
> the following warning: 
> 
> drivers/media/platform/coda.c:1543: warning: '__cancel_delayed_work' is deprecated (declared at include/linux/workqueue.h:437)
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Acked-by: Tejun Heo <tj@kernel.org>

Thanks!
Javier Martin Oct. 10, 2012, 6:52 a.m. UTC | #2 
On 10 October 2012 05:43, Tejun Heo <tj@kernel.org> wrote:
> On Wed, Oct 10, 2012 at 12:33:29AM -0300, Fabio Estevam wrote:
>> From: Fabio Estevam <fabio.estevam@freescale.com>
>>
>> commit 136b5721d (workqueue: deprecate __cancel_delayed_work()) made
>> __cancel_delayed_work deprecated. Use cancel_delayed_work instead and get rid of
>> the following warning:
>>
>> drivers/media/platform/coda.c:1543: warning: '__cancel_delayed_work' is deprecated (declared at include/linux/workqueue.h:437)
>>
>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>
> Acked-by: Tejun Heo <tj@kernel.org>
>
> Thanks!
>
> --
> tejun

Thanks Fabio.

Acked-by: Javier Martin <javier.martin@vista-silicon.com>
diff mbox

Patch

diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index cd04ae2..7640505 100644
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -1540,7 +1540,7 @@  static irqreturn_t coda_irq_handler(int irq, void *data)
 	u32 wr_ptr, start_ptr;
 	struct coda_ctx *ctx;
 
-	__cancel_delayed_work(&dev->timeout);
+	cancel_delayed_work(&dev->timeout);
 
 	/* read status register to attend the IRQ */
 	coda_read(dev, CODA_REG_BIT_INT_STATUS);