Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752618AbaABMRA (ORCPT ); Thu, 2 Jan 2014 07:17:00 -0500 Received: from moutng.kundenserver.de ([212.227.126.171]:52209 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751570AbaABMIH (ORCPT ); Thu, 2 Jan 2014 07:08:07 -0500 From: Arnd Bergmann To: linux-kernel@vger.kernel.org Cc: Arnd Bergmann , Hans Verkuil , Mauro Carvalho Chehab , linux-media@vger.kernel.org Subject: [PATCH, RFC 06/30] [media] usbvision: remove bogus sleep_on_timeout Date: Thu, 2 Jan 2014 13:07:30 +0100 Message-Id: <1388664474-1710039-7-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1388664474-1710039-1-git-send-email-arnd@arndb.de> References: <1388664474-1710039-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:xHSS2uFA57/CBW0ACnF7GXO0j2ElBoKU1umVSyAepxd SVNOckt19aPbl4CyXjMWjzwD1vcO5Nt2xOwzRkGnrjEFGLogvN e8mGfzX8FwQRE+qEs844nHqADOJiyZLXz96zKzXuSeSr82h5Uy FdtMCN8C2wpSQwCqYKtCnsav+z0gJMMMzMZnaqKP/RKqRpcyuG wR4aJGS0ghdbjfh24Asg6J1fifKdErAe0KD6ogaw3jXR733iNL KXILNjuKZHGgWxhQgnGDKI6dG6SljTKM0WRo4UJVcvoMjINHcp SRbt3ZXiiBSJyVo5DJs47BuMybtj7dL3iOfIGzH88GB35Y6hAq 75E/n61CDAVOO6Zvt7WB0q57/d0KrJJKfBHmr9JPt Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1160 Lines: 35 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 Cc: Hans Verkuil Cc: Mauro Carvalho Chehab 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); \ } /* -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/