From patchwork Wed Oct 24 12:14:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 15168 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TQzrA-0004st-0y for patchwork@linuxtv.org; Wed, 24 Oct 2012 14:14:44 +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 1TQzr9-0005s8-D1; Wed, 24 Oct 2012 14:14:43 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758057Ab2JXMOk (ORCPT ); Wed, 24 Oct 2012 08:14:40 -0400 Received: from mail-ye0-f174.google.com ([209.85.213.174]:44370 "EHLO mail-ye0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758022Ab2JXMOk (ORCPT ); Wed, 24 Oct 2012 08:14:40 -0400 Received: by mail-ye0-f174.google.com with SMTP id m12so37297yen.19 for ; Wed, 24 Oct 2012 05:14:39 -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=S/7I57ovJakJ5E79yFITzQiD56yYXyzG5PcALJb6y5I=; b=eFBSgCyJViDLCKjrp6gU2GYpey3ukh5k7UnywkoUYsogoEe37pzJWWzMZJPiO2WJwc L9+jStYS4ocwRpBe1pvNZaXKbg5EbxxwezzSNwqgojigiwtNRubKDgFV3jFKSq1bz5CC CaRfccnhcT9ssj/869xrYjviX7xse5OaXueuvIMwBjx79M3+qIOPxnBrndR/n2k+1F74 sbkBOQM+cYx4VlMKTJ5pSG47JJ8j5Txip87KjHDqHcDezqtXRYVbokV5vvY0bYg4VAba VsOMRkL7V8LPBaDhji2VDsKCouBVZysvNxPhR+BlipzmSSIbTYO0asorvSx7xIsEdSc4 EP1g== Received: by 10.236.119.37 with SMTP id m25mr14522448yhh.95.1351080879502; Wed, 24 Oct 2012 05:14:39 -0700 (PDT) Received: from fabio-Latitude-E6410.cps.virtua.com.br ([201.82.136.205]) by mx.google.com with ESMTPS id o12sm13113615anp.8.2012.10.24.05.14.37 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 05:14:38 -0700 (PDT) From: Fabio Estevam To: awalls@md.metrocast.net Cc: mchehab@infradead.org, linux-media@vger.kernel.org, tj@kernel.org, Fabio Estevam Subject: [PATCH] [media] ivtv: ivtv-driver: Replace 'flush_work_sync()' Date: Wed, 24 Oct 2012 10:14:16 -0200 Message-Id: <1351080856-20469-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.24.120916 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_1000_1099 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 Since commit 43829731d (workqueue: deprecate flush[_delayed]_work_sync()), flush_work() should be used instead of flush_work_sync(). Signed-off-by: Fabio Estevam Acked-by: Tejun Heo --- drivers/media/pci/ivtv/ivtv-driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c index 74e9a50..5d0a5df 100644 --- a/drivers/media/pci/ivtv/ivtv-driver.c +++ b/drivers/media/pci/ivtv/ivtv-driver.c @@ -304,7 +304,7 @@ static void request_modules(struct ivtv *dev) static void flush_request_modules(struct ivtv *dev) { - flush_work_sync(&dev->request_module_wk); + flush_work(&dev->request_module_wk); } #else #define request_modules(dev)