2010-10-15 12:09:08

by Tejun Heo

Subject: [PATCH v2.6.36-rc7] crypto: use cancel_delayed_work_sync() in hifn_795x

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 <[email protected]>
---
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);

2010-10-19 12:50:49

by Herbert Xu

Subject: Re: [PATCH v2.6.36-rc7] crypto: use cancel_delayed_work_sync() in hifn_795x

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 <[email protected]>

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