| Message ID | 1388664474-1710039-7-git-send-email-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 01/02/2014 01:07 PM, Arnd Bergmann wrote: > There is no reason to use sleep_on_timeout here, and we want to get > rid of that interface. Use the simpler msleep_interruptible instead. Since this define is unused anyway, lets just remove it completely. I'll post a patch for this. Regards, Hans > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Cc: Hans Verkuil <hverkuil@xs4all.nl> > Cc: Mauro Carvalho Chehab <m.chehab@samsung.com> > Cc: linux-media@vger.kernel.org > --- > drivers/media/usb/usbvision/usbvision.h | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/media/usb/usbvision/usbvision.h b/drivers/media/usb/usbvision/usbvision.h > index 8a25876..eb6dc8a 100644 > --- a/drivers/media/usb/usbvision/usbvision.h > +++ b/drivers/media/usb/usbvision/usbvision.h > @@ -205,10 +205,8 @@ enum { > > /* Debugging aid */ > #define USBVISION_SAY_AND_WAIT(what) { \ > - wait_queue_head_t wq; \ > - init_waitqueue_head(&wq); \ > printk(KERN_INFO "Say: %s\n", what); \ > - interruptible_sleep_on_timeout(&wq, HZ * 3); \ > + msleep_interruptible(3000); \ > } > > /* > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/usb/usbvision/usbvision.h b/drivers/media/usb/usbvision/usbvision.h index 8a25876..eb6dc8a 100644 --- a/drivers/media/usb/usbvision/usbvision.h +++ b/drivers/media/usb/usbvision/usbvision.h @@ -205,10 +205,8 @@ enum { /* Debugging aid */ #define USBVISION_SAY_AND_WAIT(what) { \ - wait_queue_head_t wq; \ - init_waitqueue_head(&wq); \ printk(KERN_INFO "Say: %s\n", what); \ - interruptible_sleep_on_timeout(&wq, HZ * 3); \ + msleep_interruptible(3000); \ } /*
There is no reason to use sleep_on_timeout here, and we want to get rid of that interface. Use the simpler msleep_interruptible instead. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Hans Verkuil <hverkuil@xs4all.nl> Cc: Mauro Carvalho Chehab <m.chehab@samsung.com> Cc: linux-media@vger.kernel.org --- drivers/media/usb/usbvision/usbvision.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)