Re: [PATCH 16/24] ab8500-bm: Flush all work queues before suspending

[Anton Vorontsov]

On Mon, Jan 21, 2013 at 12:03:52PM +0000, Lee Jones wrote:
> From: Jonas Aaberg <jonas.aberg@xxxxxxxxxxxxxx>
> 
> Flush all workqueues at suspend time to avoid suspending during work.
> 
> Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
> Signed-off-by: Jonas Aaberg <jonas.aberg@xxxxxxxxxxxxxx>
> Reviewed-by: Marcus COOPER <marcus.xm.cooper@xxxxxxxxxxxxxx>
> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/61915

I do remeber I was commenting on that patch, and I was asking to merge the
changes into the patches that introduce the workqueues (aka problems).

Now I see that "ab8500_charger: Detect charger removal" commit already in
the mainline, i.e. I merged the patch with the *known* possible
regression. The issue was known to me during the first review cycle, and I
pointed you to my review comments. But the patch sneaked in anyway...

> ---
>  drivers/power/ab8500_charger.c |   11 +++++++++++
>  drivers/power/ab8500_fg.c      |    5 +++++
>  2 files changed, 16 insertions(+)
> 
> diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
> index da965ee..a632b94 100644
> --- a/drivers/power/ab8500_charger.c
> +++ b/drivers/power/ab8500_charger.c
> @@ -2866,6 +2866,17 @@ static int ab8500_charger_suspend(struct platform_device *pdev,
>  	if (delayed_work_pending(&di->check_hw_failure_work))
>  		cancel_delayed_work(&di->check_hw_failure_work);
>  
> +	flush_delayed_work(&di->attach_work);
> +	flush_delayed_work(&di->usb_charger_attached_work);
> +	flush_delayed_work(&di->ac_charger_attached_work);
> +	flush_delayed_work(&di->check_usbchgnotok_work);
> +	flush_delayed_work(&di->check_vbat_work);
> +	flush_delayed_work(&di->kick_wd_work);
> +
> +	flush_work(&di->usb_link_status_work);
> +	flush_work(&di->ac_work);
> +	flush_work(&di->detect_usb_type_work);
> +
>  	return 0;
>  }
>  #else
> diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
> index 0378aab..1a78116 100644
> --- a/drivers/power/ab8500_fg.c
> +++ b/drivers/power/ab8500_fg.c
> @@ -2410,6 +2410,11 @@ static int ab8500_fg_suspend(struct platform_device *pdev,
>  	struct ab8500_fg *di = platform_get_drvdata(pdev);
>  
>  	flush_delayed_work(&di->fg_periodic_work);
> +	flush_work(&di->fg_work);
> +	flush_work(&di->fg_acc_cur_work);
> +	flush_delayed_work(&di->fg_reinit_work);
> +	flush_delayed_work(&di->fg_low_bat_work);
> +	flush_delayed_work(&di->fg_check_hw_failure_work);
>  
>  	/*
>  	 * If the FG is enabled we will disable it before going to suspend
> -- 
> 1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/