Re: [PATCH 09/30] sound: don't use flush_scheduled_work()

[Takashi Iwai <tiwai@suse.de>]

At Sat, 11 Dec 2010 17:51:26 +0100,
Tejun Heo wrote:
> 
> flush_scheduled_work() is deprecated and scheduled to be removed.
> 
> * cancel[_delayed]_work() + flush_scheduled_work() ->
>   cancel[_delayed]_work_sync().
> 
> * wm8350, wm8753 and soc-core use custom code to cancel a delayed
>   work, execute it immediately if it was pending and wait for its
>   completion.  This is equivalent to flush_delayed_work_sync().  Use
>   it instead.
> 
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Takashi Iwai <tiwai@suse.de>
> Cc: Jaroslav Kysela <perex@perex.cz>
> ---
> This is part of a series to remove flush_scheduled_work() usage to
> prepare for deprecation of flush_scheduled_work().  Patches in this
> series are self contained and mostly straight-forward.
> 
> Please feel free to take it into the appropriate tree, or just ack it.
> In the latter case, I'll merge the patch through the workqueue tree
> during the next merge window.

The most of parts look OK to me, but I'm not sure about ASoC changes,
e.g. below one:

> diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
> index 7611add..b3e9fac 100644
> --- a/sound/soc/codecs/wm8350.c
> +++ b/sound/soc/codecs/wm8350.c
> @@ -1626,7 +1626,6 @@ static int  wm8350_codec_remove(struct snd_soc_codec *codec)
>  {
>  	struct wm8350_data *priv = snd_soc_codec_get_drvdata(codec);
>  	struct wm8350 *wm8350 = dev_get_platdata(codec->dev);
> -	int ret;
>  
>  	wm8350_clear_bits(wm8350, WM8350_JACK_DETECT,
>  			  WM8350_JDL_ENA | WM8350_JDR_ENA);
> @@ -1641,15 +1640,9 @@ static int  wm8350_codec_remove(struct snd_soc_codec *codec)
>  	priv->hpr.jack = NULL;
>  	priv->mic.jack = NULL;
>  
> -	/* cancel any work waiting to be queued. */
> -	ret = cancel_delayed_work(&codec->delayed_work);
> -
>  	/* if there was any work waiting then we run it now and
>  	 * wait for its completion */
> -	if (ret) {
> -		schedule_delayed_work(&codec->delayed_work, 0);
> -		flush_scheduled_work();
> -	}
> +	flush_delayed_work_sync(&codec->delayed_work);

I vaguely remember Liam introduced this kind of code by some reason.

Liam, isn't it better for cancel_delayed_work_sync(), or should it be
like the above?


thanks,

Takashi