From patchwork Thu Jan 2 12:07:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 3424861 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7BE7A9F295 for ; Thu, 2 Jan 2014 12:17:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 53E3920145 for ; Thu, 2 Jan 2014 12:17:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D68E020034 for ; Thu, 2 Jan 2014 12:17:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752194AbaABMQ7 (ORCPT ); Thu, 2 Jan 2014 07:16:59 -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 Received: from wuerfel.lan (HSI-KBW-085-216-031-165.hsi.kabelbw.de [85.216.31.165]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0MQd8X-1VqgrQ06UH-00Ulgt; Thu, 02 Jan 2014 13:08:05 +0100 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-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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); \ } /*