* [PATCH] HID: picoLCD: Remove use of deprecated function
@ 2012-09-06 14:46 Emil Goode
2012-09-06 20:12 ` Bruno Prémont
0 siblings, 1 reply; 7+ messages in thread
From: Emil Goode @ 2012-09-06 14:46 UTC (permalink / raw)
To: bonbons, jkosina; +Cc: linux-input, linux-kernel, kernel-janitors, Emil Goode
The flush_delayed_work_sync function is deprecated,
we can instead call flush_delayed_work directly.
Sparse is giving a warning:
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: Emil Goode <emilgoode@gmail.com>
---
drivers/hid/hid-picolcd_fb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/hid/hid-picolcd_fb.c b/drivers/hid/hid-picolcd_fb.c
index 0008a51..eb00357 100644
--- a/drivers/hid/hid-picolcd_fb.c
+++ b/drivers/hid/hid-picolcd_fb.c
@@ -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);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] HID: picoLCD: Remove use of deprecated function
2012-09-06 14:46 [PATCH] HID: picoLCD: Remove use of deprecated function Emil Goode
@ 2012-09-06 20:12 ` Bruno Prémont
2012-09-06 20:15 ` Tejun Heo
0 siblings, 1 reply; 7+ messages in thread
From: Bruno Prémont @ 2012-09-06 20:12 UTC (permalink / raw)
To: Emil Goode; +Cc: jkosina, linux-input, linux-kernel, kernel-janitors, Tejun Heo
On Thu, 06 September 2012 Emil Goode <emilgoode@gmail.com> wrote:
> The flush_delayed_work_sync function is deprecated,
> we can instead call flush_delayed_work directly.
>
> Sparse is giving a warning:
> 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: Emil Goode <emilgoode@gmail.com>
Acked-by: Bruno Prémont <bonbons@linux-vserver.org>
This matches a patch by Tejun a few weeks ago which was partially
skipped in -next due to merge conflict with code split in picoLCD.
See http://comments.gmane.org/gmane.linux.kernel.next/23740
For the sake of proper bisectability, this should go in after
Tejun's workqueue changes (if needed at all depending on how merge
happens during pull by Linus).
Bruno
> ---
> drivers/hid/hid-picolcd_fb.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/hid/hid-picolcd_fb.c b/drivers/hid/hid-picolcd_fb.c
> index 0008a51..eb00357 100644
> --- a/drivers/hid/hid-picolcd_fb.c
> +++ b/drivers/hid/hid-picolcd_fb.c
> @@ -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);
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] HID: picoLCD: Remove use of deprecated function
2012-09-06 20:12 ` Bruno Prémont
@ 2012-09-06 20:15 ` Tejun Heo
2012-09-07 13:11 ` Jiri Kosina
2012-10-01 22:18 ` Jiri Kosina
0 siblings, 2 replies; 7+ messages in thread
From: Tejun Heo @ 2012-09-06 20:15 UTC (permalink / raw)
To: Bruno Prémont
Cc: Emil Goode, jkosina, linux-input, linux-kernel, kernel-janitors
On Thu, Sep 06, 2012 at 10:12:52PM +0200, Bruno Prémont wrote:
> On Thu, 06 September 2012 Emil Goode <emilgoode@gmail.com> wrote:
> > The flush_delayed_work_sync function is deprecated,
> > we can instead call flush_delayed_work directly.
> >
> > Sparse is giving a warning:
> > 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: Emil Goode <emilgoode@gmail.com>
>
> Acked-by: Bruno Prémont <bonbons@linux-vserver.org>
>
> This matches a patch by Tejun a few weeks ago which was partially
> skipped in -next due to merge conflict with code split in picoLCD.
>
> See http://comments.gmane.org/gmane.linux.kernel.next/23740
>
> For the sake of proper bisectability, this should go in after
> Tejun's workqueue changes (if needed at all depending on how merge
> happens during pull by Linus).
Yeah, we either can ask Linus to fix it up during merge or send a
separate patch afterwards. In this case, I don't think it matters too
much either way. I tend to send out pull request fairly early in the
merge window, I'll try to remember to poke Linus about the merge
conflict.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] HID: picoLCD: Remove use of deprecated function
2012-09-06 20:15 ` Tejun Heo
@ 2012-09-07 13:11 ` Jiri Kosina
2012-10-01 22:18 ` Jiri Kosina
1 sibling, 0 replies; 7+ messages in thread
From: Jiri Kosina @ 2012-09-07 13:11 UTC (permalink / raw)
To: Tejun Heo
Cc: Bruno Prémont, Emil Goode, linux-input, linux-kernel,
kernel-janitors
On Thu, 6 Sep 2012, Tejun Heo wrote:
> > > The flush_delayed_work_sync function is deprecated,
> > > we can instead call flush_delayed_work directly.
> > >
> > > Sparse is giving a warning:
> > > 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: Emil Goode <emilgoode@gmail.com>
> >
> > Acked-by: Bruno Prémont <bonbons@linux-vserver.org>
> >
> > This matches a patch by Tejun a few weeks ago which was partially
> > skipped in -next due to merge conflict with code split in picoLCD.
> >
> > See http://comments.gmane.org/gmane.linux.kernel.next/23740
> >
> > For the sake of proper bisectability, this should go in after
> > Tejun's workqueue changes (if needed at all depending on how merge
> > happens during pull by Linus).
>
> Yeah, we either can ask Linus to fix it up during merge or send a
> separate patch afterwards. In this case, I don't think it matters too
> much either way. I tend to send out pull request fairly early in the
> merge window, I'll try to remember to poke Linus about the merge
> conflict.
Okay, fair enough. I'll try not to forget to CC you on my pull request
which will include those picolcd changes, and mention the potential
conflict to Linus as well. We'll see which one goes in first :)
Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] HID: picoLCD: Remove use of deprecated function
2012-09-06 20:15 ` Tejun Heo
2012-09-07 13:11 ` Jiri Kosina
@ 2012-10-01 22:18 ` Jiri Kosina
2012-10-02 5:51 ` Tejun Heo
1 sibling, 1 reply; 7+ messages in thread
From: Jiri Kosina @ 2012-10-01 22:18 UTC (permalink / raw)
To: Tejun Heo
Cc: Bruno Prémont, Emil Goode, linux-input, linux-kernel,
kernel-janitors
On Thu, 6 Sep 2012, Tejun Heo wrote:
> > > Sparse is giving a warning:
> > > 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: Emil Goode <emilgoode@gmail.com>
> >
> > Acked-by: Bruno Prémont <bonbons@linux-vserver.org>
> >
> > This matches a patch by Tejun a few weeks ago which was partially
> > skipped in -next due to merge conflict with code split in picoLCD.
> >
> > See http://comments.gmane.org/gmane.linux.kernel.next/23740
> >
> > For the sake of proper bisectability, this should go in after
> > Tejun's workqueue changes (if needed at all depending on how merge
> > happens during pull by Linus).
>
> Yeah, we either can ask Linus to fix it up during merge or send a
> separate patch afterwards. In this case, I don't think it matters too
> much either way. I tend to send out pull request fairly early in the
> merge window, I'll try to remember to poke Linus about the merge
> conflict.
Linus has just pulled from me, so if you could take care of this merge
conflict, that'd be awesome.
Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] HID: picoLCD: Remove use of deprecated function
2012-10-01 22:18 ` Jiri Kosina
@ 2012-10-02 5:51 ` Tejun Heo
0 siblings, 0 replies; 7+ messages in thread
From: Tejun Heo @ 2012-10-02 5:51 UTC (permalink / raw)
To: Jiri Kosina
Cc: Bruno Prémont, Emil Goode, linux-input, linux-kernel,
kernel-janitors
On Tue, Oct 02, 2012 at 12:18:00AM +0200, Jiri Kosina wrote:
> Linus has just pulled from me, so if you could take care of this merge
> conflict, that'd be awesome.
Will do. Thanks.
--
tejun
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] HID: picoLCD: Remove use of deprecated function
2012-10-02 7:00 [GIT PULL] workqueue changes for v3.7-rc1 Tejun Heo
@ 2012-10-02 8:06 ` Tejun Heo
0 siblings, 0 replies; 7+ messages in thread
From: Tejun Heo @ 2012-10-02 8:06 UTC (permalink / raw)
To: Linus Torvalds
Cc: linux-kernel, Lai Jiangshan, Joonsoo Kim, Thomas Gleixner,
Ingo Molnar, Jiri Kosina, emilgoode, Bruno Prémont
From: Emil Goode <emilgoode@gmail.com>
The flush_delayed_work_sync function is deprecated,
we can instead call flush_delayed_work directly.
Sparse is giving a warning:
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: Emil Goode <emilgoode@gmail.com>
Acked-by: Bruno Prémont <bonbons@linux-vserver.org>
---
This can be applied as part of the merge or on top after merge.
Thanks.
drivers/hid/hid-picolcd_fb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/hid/hid-picolcd_fb.c b/drivers/hid/hid-picolcd_fb.c
index 0008a51..eb00357 100644
--- a/drivers/hid/hid-picolcd_fb.c
+++ b/drivers/hid/hid-picolcd_fb.c
@@ -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);
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-10-02 8:07 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-06 14:46 [PATCH] HID: picoLCD: Remove use of deprecated function Emil Goode
2012-09-06 20:12 ` Bruno Prémont
2012-09-06 20:15 ` Tejun Heo
2012-09-07 13:11 ` Jiri Kosina
2012-10-01 22:18 ` Jiri Kosina
2012-10-02 5:51 ` Tejun Heo
2012-10-02 7:00 [GIT PULL] workqueue changes for v3.7-rc1 Tejun Heo
2012-10-02 8:06 ` [PATCH] HID: picoLCD: Remove use of deprecated function Tejun Heo
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).