From patchwork Tue Dec 14 15:23:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 410431 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBEFP8J2026411 for ; Tue, 14 Dec 2010 15:25:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759351Ab0LNPYf (ORCPT ); Tue, 14 Dec 2010 10:24:35 -0500 Received: from hera.kernel.org ([140.211.167.34]:51079 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759279Ab0LNPYe (ORCPT ); Tue, 14 Dec 2010 10:24:34 -0500 Received: from htj.dyndns.org (localhost [127.0.0.1]) by hera.kernel.org (8.14.4/8.14.3) with ESMTP id oBEFNBtj011498; Tue, 14 Dec 2010 15:23:11 GMT X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.96.4 at hera.kernel.org Received: from [127.0.0.2] (htj.dyndns.org [127.0.0.2]) by htj.dyndns.org (Postfix) with ESMTPSA id C93611CC06A5; Tue, 14 Dec 2010 16:23:10 +0100 (CET) Message-ID: <4D078BDE.8060102@kernel.org> Date: Tue, 14 Dec 2010 16:23:10 +0100 From: Tejun Heo User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.9.2.13) Gecko/20101207 Lightning/1.0b2 Thunderbird/3.1.7 MIME-Version: 1.0 To: linux-kernel@vger.kernel.org CC: jgarzik@pobox.com, benh@kernel.crashing.org, mchehab@infradead.org, davem@davemloft.net, netdev@vger.kernel.org, cbou@mail.ru, dwmw2@infradead.org, zbr@ioremap.net, gregkh@suse.de, bfields@fieldses.org, neilb@suse.de, aelder@sgi.com, xfs-masters@oss.sgi.com, cl@linux-foundation.org, penberg@cs.helsinki.fi, akpm@linux-foundation.org, netfilter-devel@vger.kernel.org, Trond.Myklebust@netapp.com, linux-nfs@vger.kernel.org Subject: [PATCH 2/2] workqueue: deprecate cancel_rearming_delayed_work[queue]() References: <4D078B6D.5060202@kernel.org> In-Reply-To: <4D078B6D.5060202@kernel.org> X-Enigmail-Version: 1.1.1 X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on hera.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 14 Dec 2010 15:25:09 +0000 (UTC) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.3 (hera.kernel.org [127.0.0.1]); Tue, 14 Dec 2010 15:23:12 +0000 (UTC) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 6c2f55e..4ff47de 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -564,3 +564,13 @@ Why: This field is deprecated. I2C device drivers shouldn't change their Who: Jean Delvare ---------------------------- + +What: cancel_rearming_delayed_work[queue]() +When: 2.6.39 + +Why: The functions have been superceded by cancel_delayed_work_sync() + quite some time ago. The conversion is trivial and there is no + in-kernel user left. +Who: Tejun Heo + +---------------------------- diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index 0c0771f..6b5193d 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -401,7 +401,7 @@ static inline bool __cancel_delayed_work(struct delayed_work *work) } /* Obsolete. use cancel_delayed_work_sync() */ -static inline +static inline __deprecated void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq, struct delayed_work *work) { @@ -409,7 +409,7 @@ void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq, } /* Obsolete. use cancel_delayed_work_sync() */ -static inline +static inline __deprecated void cancel_rearming_delayed_work(struct delayed_work *work) { cancel_delayed_work_sync(work);