Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751111AbWJKMjh (ORCPT ); Wed, 11 Oct 2006 08:39:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161014AbWJKMjh (ORCPT ); Wed, 11 Oct 2006 08:39:37 -0400 Received: from mail01.verismonetworks.com ([164.164.99.228]:46828 "EHLO mail01.verismonetworks.com") by vger.kernel.org with ESMTP id S1751239AbWJKMjg (ORCPT ); Wed, 11 Oct 2006 08:39:36 -0400 Subject: [PATCH 1/2] drivers/cdrom/cdu31a.c: Replacing yield() with a better alternative From: Amol Lad To: linux kernel Cc: kernel Janitors Content-Type: text/plain Date: Wed, 11 Oct 2006 18:12:56 +0530 Message-Id: <1160570576.19143.301.camel@amol.verismonetworks.com> Mime-Version: 1.0 X-Mailer: Evolution 2.2.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1229 Lines: 33 In 2.6, the semantics of calling yield() changed from "sleep for a bit" to "I really don't want to run for a while". This matches POSIX better, but there's a lot of drivers still using yield() when they mean cond_resched(), schedule() or even schedule_timeout(). For this driver schedule_timeout_interruptible() seems to be a better alternative Tested compile only Signed-off-by: Amol Lad --- diff -uprN -X linux-2.6.19-rc1-orig/Documentation/dontdiff linux-2.6.19-rc1-orig/drivers/cdrom/cdu31a.c linux-2.6.19-rc1/drivers/cdrom/cdu31a.c --- linux-2.6.19-rc1-orig/drivers/cdrom/cdu31a.c 2006-10-05 14:00:42.000000000 +0530 +++ linux-2.6.19-rc1/drivers/cdrom/cdu31a.c 2006-10-11 17:28:42.000000000 +0530 @@ -370,7 +370,7 @@ static inline void disable_interrupts(vo static inline void sony_sleep(void) { if (cdu31a_irq <= 0) { - yield(); + schedule_timeout_interruptible(1); } else { /* Interrupt driven */ DEFINE_WAIT(w); int first = 1; - 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/