From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753130Ab1AXPCu (ORCPT ); Mon, 24 Jan 2011 10:02:50 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:63694 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752898Ab1AXPCt (ORCPT ); Mon, 24 Jan 2011 10:02:49 -0500 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=PPSXAUGubye5wYQTjtaPWxAy7gga100WN0kK1KVaERQ40X3WwBmhlB8AgdSswyL712 ykQZCbjXCspmGFeXp0oWWTVWgjvqxtms9uLVXkzBKVpnm66ixV14/JqkLsNb1u5qDgTU wj6MEM4KjrCn+APyuGqFtq/m7Tm7FyLacAD+s= Date: Mon, 24 Jan 2011 16:02:44 +0100 From: Tejun Heo To: Jaya Kumar Cc: linux-kernel@vger.kernel.org Subject: [PATCH] fb_defio: don't use flush_scheduled_work() Message-ID: <20110124150244.GH11404@htj.dyndns.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org flush_scheduled_work() scheduled for deprecation. Sync cancel info->deferred_work directly instead. Signed-off-by: Tejun Heo Cc: Jaya Kumar --- drivers/video/fb_defio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Index: work/drivers/video/fb_defio.c =================================================================== --- work.orig/drivers/video/fb_defio.c +++ work/drivers/video/fb_defio.c @@ -216,8 +216,7 @@ void fb_deferred_io_cleanup(struct fb_in int i; BUG_ON(!fbdefio); - cancel_delayed_work(&info->deferred_work); - flush_scheduled_work(); + cancel_delayed_work_sync(&info->deferred_work); /* clear out the mapping that we setup */ for (i = 0 ; i < info->fix.smem_len; i += PAGE_SIZE) {