[patch 3/8] serial/pmac_zilog: replace schedule_timeout() with msleep()

janitor_at_sternwelten.at
Date: 10/31/04

  • Next message: Nishanth Aravamudan: "Re: 2.6.10-rc1-kjt1: ixgb_ethtool.c doesn't compile" 
    To: rmk+lkml@arm.linux.org.uk
Date:	Sun, 31 Oct 2004 00:47:05 +0200

    Any comments would be appreciated.

    Description: Use msleep() instead of schedule_timeout() to
    guarantee the task delays as expected.

    Signed-off-by: Maximilian Attems <janitor@sternwelten.at> 

    ---
 linux-2.6.10-rc1-max/drivers/serial/pmac_zilog.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
diff -puN drivers/serial/pmac_zilog.c~msleep-drivers_serial_pmac_zilog drivers/serial/pmac_zilog.c
--- linux-2.6.10-rc1/drivers/serial/pmac_zilog.c~msleep-drivers_serial_pmac_zilog	2004-10-24 17:05:09.000000000 +0200
+++ linux-2.6.10-rc1-max/drivers/serial/pmac_zilog.c	2004-10-24 17:05:09.000000000 +0200
@@ -949,8 +949,7 @@ static int pmz_startup(struct uart_port 
 	 */
 	if (pwr_delay != 0) {
 		pmz_debug("pmz: delaying %d ms\n", pwr_delay);
-		set_current_state(TASK_UNINTERRUPTIBLE);
-		schedule_timeout((pwr_delay * HZ)/1000);
+		msleep(pwr_delay);
 	}
 
 	/* IrDA reset is done now */
@@ -1684,8 +1683,7 @@ static int pmz_resume(struct macio_dev *
 	 */
 	if (pwr_delay != 0) {
 		pmz_debug("pmz: delaying %d ms\n", pwr_delay);
-		set_current_state(TASK_UNINTERRUPTIBLE);
-		schedule_timeout((pwr_delay * HZ)/1000);
+		msleep(pwr_delay);
 	}
 
 	pmz_debug("resume, switching complete\n");
_
-
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/
  • Next message: Nishanth Aravamudan: "Re: 2.6.10-rc1-kjt1: ixgb_ethtool.c doesn't compile"

    Relevant Pages