| Message ID | 1346942780-8091-1-git-send-email-emilgoode@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Jiri Kosina |
| Headers | show |
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); -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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.
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,
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,
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.
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);
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(-)