From patchwork Wed Jun 15 13:32:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 881872 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5FDWEJo030655 for ; Wed, 15 Jun 2011 13:32:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754766Ab1FONcM (ORCPT ); Wed, 15 Jun 2011 09:32:12 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:32827 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754221Ab1FONcK (ORCPT ); Wed, 15 Jun 2011 09:32:10 -0400 Received: by fxm17 with SMTP id 17so395400fxm.19 for ; Wed, 15 Jun 2011 06:32:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:date:from:to:cc:subject:message-id :mime-version:content-type:content-disposition:user-agent; bh=cdlMFvILsx68q/D/N8uOD4IotMu9z5/3Ty5Gov5Sw3c=; b=kmcsxdKNdYhOfB4hXOSxBdOfjlM4/O6FQnItWZYpCLMYSbW+GH/aGf8hp6A1j2SBJ4 A9jl38wxjYSRldRwTwZrXz5cSbB8jm1p4M+RCUKBrqjkUMj06qRtOrZln301Byy3877t KIl0U1lJgFAA1eormOX3Wg1F4i9zNTAp6BuuY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=OWOjp3TsUIj93RBlGIZr817SqRb0kUwn7NK0fNlFK5mT8hLxSC2t4vgOifHo0kUpyh XHvoJXeHX6H1gL+Koaeuxm0gXeYENInWm4pCxse+dAIXhdTeNZGrMoahY2IOuU5D2H5r ouWvkxmI/ZGAV2vGVA3RnQdJfWPoV0CdTimGc= Received: by 10.223.73.139 with SMTP id q11mr611950faj.56.1308144729330; Wed, 15 Jun 2011 06:32:09 -0700 (PDT) Received: from htj.dyndns.org ([130.75.117.88]) by mx.google.com with ESMTPS id n7sm220150fam.43.2011.06.15.06.32.08 (version=SSLv3 cipher=OTHER); Wed, 15 Jun 2011 06:32:08 -0700 (PDT) Date: Wed, 15 Jun 2011 15:32:06 +0200 From: Tejun Heo To: Mauro Carvalho Chehab , Patrick Boettcher Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] dvb-usb/technisat-usb2: don't use flush_scheduled_work() Message-ID: <20110615133206.GW8141@htj.dyndns.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 15 Jun 2011 13:32:15 +0000 (UTC) flush_scheduled_work() is deprecated and scheduled to be removed. technisat-usb2 already sync-cancels the only work item it uses and there's no reason for it to call flush_scheduled_work(). Don't use it. Signed-off-by: Tejun Heo Cc: Mauro Carvalho Chehab Cc: Patrick Boettcher --- I was re-scanning source tree to prepare for deprecation of flush_scheduled_work() and found out new driver added usage unnecessarily. Can you please include this patch so that it gets propagated to linux-next soonish? Thank you. drivers/media/dvb/dvb-usb/technisat-usb2.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: work/drivers/media/dvb/dvb-usb/technisat-usb2.c =================================================================== --- work.orig/drivers/media/dvb/dvb-usb/technisat-usb2.c +++ work/drivers/media/dvb/dvb-usb/technisat-usb2.c @@ -765,10 +765,8 @@ static void technisat_usb2_disconnect(st /* work and stuff was only created when the device is is hot-state */ if (dev != NULL) { struct technisat_usb2_state *state = dev->priv; - if (state != NULL) { + if (state != NULL) cancel_delayed_work_sync(&state->green_led_work); - flush_scheduled_work(); - } } dvb_usb_device_exit(intf);