HID: picolcd_fb: Use flush_delayed_work instead of flush_delayed_work_sync

PATCH In review Axel Lin 2 participants 2 messages Sep 12, 2012

Subsystems (2)

HID Picolcd HID driver

lore

Share & tools

lore

Axel Lin

author

2012-09-12 05:39 UTC #0 lore raw

PATCH 1/1 HID: picolcd_fb: Use flush_delayed_work instead of flush_delayed_work_sync

Seems this is a left over of commit 4382973 "workqueue: deprecate flush[_delayed]_work_sync()"

This fixes below build warning:

CC [M] drivers/hid/hid-picolcd_fb.o
drivers/hid/hid-picolcd_fb.c: In function 'picolcd_exit_framebuffer':
drivers/hid/hid-picolcd_fb.c:611:2: warning: 'flush_delayed_work_sync' is deprecated (declared at include/linux/workqueue.h:454) [-Wdeprecated-declarations]

Signed-off-by Axel Lin <[email protected]>

Cc Tejun Heo <[email protected]>

---
 drivers/hid/hid-picolcd_fb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/hid/hid-picolcd_fb.c +1 -1

index 0008a51..eb00357 100644
@@ -608,7 +608,7 @@ void picolcd_exit_framebuffer(struct picolcd_data *data)
 	/* make sure there is no running update - thus that fbdata->picolcd
 	 * once obtained under lock is guaranteed not to get free() under
 	 * the feet of the deferred work */
-	flush_delayed_work_sync(&info->deferred_work);
+	flush_delayed_work(&info->deferred_work);
 
 	data->fb_info = NULL;
 	unregister_framebuffer(info);

Signature · 1 line

1.7.9.5

Bruno Prémont

maintainer

2012-09-12 05:57 UTC #1 lore raw

Hi Axel,

Quoted 2 lines · On Wed, 12 Sep 2012 13:39:09 Axel Lin <[email protected]> wrote:

Seems this is a left over of commit 4382973 "workqueue: deprecate flush[_delayed]_work_sync()"

It is, see https://lkml.org/lkml/2012/9/6/297 for a previous patch. This should fix itself when Linus merges Tejun's workqueue changes and picolcd changes.

Bruno

Quoted 25 lines

This fixes below build warning:
CC [M] drivers/hid/hid-picolcd_fb.o
drivers/hid/hid-picolcd_fb.c: In function 'picolcd_exit_framebuffer':
drivers/hid/hid-picolcd_fb.c:611:2: warning: 'flush_delayed_work_sync' is deprecated (declared at include/linux/workqueue.h:454) [-Wdeprecated-declarations]
Signed-off-by Axel Lin <[email protected]>
Cc Tejun Heo <[email protected]>
---
 drivers/hid/hid-picolcd_fb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/hid-picolcd_fb.c +1 -1
index 0008a51..eb00357 100644
@@ -608,7 +608,7 @@ void picolcd_exit_framebuffer(struct picolcd_data *data)
 	/* make sure there is no running update - thus that fbdata->picolcd
 	 * once obtained under lock is guaranteed not to get free() under
 	 * the feet of the deferred work */
-	flush_delayed_work_sync(&info->deferred_work);
+	flush_delayed_work(&info->deferred_work);
 
 	data->fb_info = NULL;
 	unregister_framebuffer(info);