From patchwork Wed Oct 10 03:33:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 14964 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TLn3T-00027Z-Ek for patchwork@linuxtv.org; Wed, 10 Oct 2012 05:33:55 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp for id 1TLn3T-0003TJ-D4; Wed, 10 Oct 2012 05:33:55 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754365Ab2JJDdq (ORCPT ); Tue, 9 Oct 2012 23:33:46 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:42014 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753014Ab2JJDdq (ORCPT ); Tue, 9 Oct 2012 23:33:46 -0400 Received: by mail-gg0-f174.google.com with SMTP id k5so17093ggd.19 for ; Tue, 09 Oct 2012 20:33:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=+GeHBYcYcQ0Jtxlw4ce0LQOnzjGc033GOpvjuAm1Aro=; b=RPbCTar1Ro0FCz7i/vwxzAxajdLbEYP1+Od0iMrTBXHJU5vu7jKmo+sMtKT8vC996S le71alznh8x7YUqNr2TbzYPiX02f8LLWgBLGt9FLvvkNbkOgVSI8XS5ibBerPvR2/gaq BFzBgZhRxAdcihUqKXRqUfwxBhCV3qCe0w54gyXQXp3vXqrGawXigvzVFnmPiphR3VxZ kwLwmb+pb0AjsIaipIS6JAihBofFQV1+vUHIzbTHLaUjc5YOz2s0JMaDvDBVejmqXB4D +ma6oHmI8+ZAQodFVC9bmzb8uiFAsXuywyTbCXEaMJQn0U8x57CJ54WiDAqDpJXkXyfb Z3wQ== Received: by 10.236.44.196 with SMTP id n44mr21320878yhb.117.1349840025246; Tue, 09 Oct 2012 20:33:45 -0700 (PDT) Received: from fabio-Latitude-E6410.cps.virtua.com.br ([201.82.136.72]) by mx.google.com with ESMTPS id r43sm183951yhc.0.2012.10.09.20.33.43 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 09 Oct 2012 20:33:44 -0700 (PDT) From: Fabio Estevam To: mchehab@infradead.org Cc: javier.martin@vista-silicon.com, linux-media@vger.kernel.org, tj@kernel.org, kernel@pengutronix.de, Fabio Estevam Subject: [PATCH] [media] coda: Do not use __cancel_delayed_work() Date: Wed, 10 Oct 2012 00:33:29 -0300 Message-Id: <1349840009-14014-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.10.10.32533 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1100_1199 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' From: Fabio Estevam 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 Acked-by: Tejun Heo Acked-by: Javier Martin --- drivers/media/platform/coda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);