linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2.6.36-rc7] crypto: use cancel_delayed_work_sync() in hifn_795x
@ 2010-10-15 12:09 Tejun Heo
  2010-10-19 12:50 ` Herbert Xu
  0 siblings, 1 reply; 2+ messages in thread
From: Tejun Heo @ 2010-10-15 12:09 UTC (permalink / raw)
  To: Herbert Xu, David S. Miller, linux-crypto, lkml

Make hifn_795x::hifn_remove() call cancel_delayed_work_sync() instead
of calling cancel_delayed_work() followed by flush_scheduled_work().

This is to prepare for the deprecation and removal of
flush_scheduled_work().

Signed-off-by: Tejun Heo <tj@kernel.org>
---
 drivers/crypto/hifn_795x.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: work/drivers/crypto/hifn_795x.c
===================================================================
--- work.orig/drivers/crypto/hifn_795x.c
+++ work/drivers/crypto/hifn_795x.c
@@ -2700,8 +2700,7 @@ static void __devexit hifn_remove(struct
 	dev = pci_get_drvdata(pdev);

 	if (dev) {
-		cancel_delayed_work(&dev->work);
-		flush_scheduled_work();
+		cancel_delayed_work_sync(&dev->work);

 		hifn_unregister_rng(dev);
 		hifn_unregister_alg(dev);

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH v2.6.36-rc7] crypto: use cancel_delayed_work_sync() in hifn_795x
  2010-10-15 12:09 [PATCH v2.6.36-rc7] crypto: use cancel_delayed_work_sync() in hifn_795x Tejun Heo
@ 2010-10-19 12:50 ` Herbert Xu
  0 siblings, 0 replies; 2+ messages in thread
From: Herbert Xu @ 2010-10-19 12:50 UTC (permalink / raw)
  To: Tejun Heo; +Cc: David S. Miller, linux-crypto, lkml

On Fri, Oct 15, 2010 at 02:09:00PM +0200, Tejun Heo wrote:
> Make hifn_795x::hifn_remove() call cancel_delayed_work_sync() instead
> of calling cancel_delayed_work() followed by flush_scheduled_work().
> 
> This is to prepare for the deprecation and removal of
> flush_scheduled_work().
> 
> Signed-off-by: Tejun Heo <tj@kernel.org>

Patch applied.  Thanks Tejun!
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-10-19 12:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-15 12:09 [PATCH v2.6.36-rc7] crypto: use cancel_delayed_work_sync() in hifn_795x Tejun Heo
2010-10-19 12:50 ` Herbert Xu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).