From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261728AbVFUGmN (ORCPT ); Tue, 21 Jun 2005 02:42:13 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261725AbVFUGUd (ORCPT ); Tue, 21 Jun 2005 02:20:33 -0400 Received: from coderock.org ([193.77.147.115]:6809 "EHLO trashy.coderock.org") by vger.kernel.org with ESMTP id S261728AbVFTVys (ORCPT ); Mon, 20 Jun 2005 17:54:48 -0400 Message-Id: <20050620215135.262572000@nd47.coderock.org> Date: Mon, 20 Jun 2005 23:51:36 +0200 From: domen@coderock.org To: axboe@suse.de Cc: linux-kernel@vger.kernel.org, Nishanth Aravamudan , domen@coderock.org Subject: [patch 06/12] block/ps2esdi: replace sleep_on() with wait_event() Content-Disposition: inline; filename=wait_event-drivers_block_ps2esdi.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org From: Nishanth Aravamudan Use wait_event() instead of the deprecated sleep_on(). In all replacements, wait_event() expects the condition to *stop* on, so the existing conditional is negated and passed as the parameter. I am not sure if these changes are appropriate, as the condition to pass to wait_event() to guarantee the same behavior; I think this is the best choice, though. Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer --- ps2esdi.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) Index: quilt/drivers/block/ps2esdi.c =================================================================== --- quilt.orig/drivers/block/ps2esdi.c +++ quilt/drivers/block/ps2esdi.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -461,8 +462,7 @@ static void __init ps2esdi_get_device_cf cmd_blk[1] = 0; no_int_yet = TRUE; ps2esdi_out_cmd_blk(cmd_blk); - if (no_int_yet) - sleep_on(&ps2esdi_int); + wait_event(ps2esdi_int, !no_int_yet); if (ps2esdi_drives > 1) { printk("%s: Drive 1\n", DEVICE_NAME); /*BA */ @@ -470,8 +470,7 @@ static void __init ps2esdi_get_device_cf cmd_blk[1] = 0; no_int_yet = TRUE; ps2esdi_out_cmd_blk(cmd_blk); - if (no_int_yet) - sleep_on(&ps2esdi_int); + wait_event(ps2esdi_int, !no_int_yet); } /* if second physical drive is present */ return; } --