Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b4ccf8d authored by Nishanth Aravamudan's avatar Nishanth Aravamudan Committed by Linus Torvalds
Browse files

[PATCH] parport: fix-up schedule_timeout() usage 



Use schedule_timeout_interruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size.  Also use
human-time to jiffies units conversion functions rather than direct HZ
division to avoid rounding issues.

Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent da4cd8df

drivers/parport/ieee1284.c

+3 −4
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ int parport_wait_peripheral(struct parport *port, 
		return 1;



	/* 40ms of slow polling. */

	deadline = jiffies + (HZ + 24) / 25;

	deadline = jiffies + msecs_to_jiffies(40);

	while (time_before (jiffies, deadline)) {

		int ret;
@@ -205,7 +205,7 @@ int parport_wait_peripheral(struct parport *port, 


		/* Wait for 10ms (or until an interrupt occurs if

		 * the handler is set) */

		if ((ret = parport_wait_event (port, (HZ + 99) / 100)) < 0)

		if ((ret = parport_wait_event (port, msecs_to_jiffies(10))) < 0)

			return ret;



		status = parport_read_status (port);
@@ -216,8 +216,7 @@ int parport_wait_peripheral(struct parport *port, 
			/* parport_wait_event didn't time out, but the

			 * peripheral wasn't actually ready either.

			 * Wait for another 10ms. */

			__set_current_state (TASK_INTERRUPTIBLE);

			schedule_timeout ((HZ+ 99) / 100);

			schedule_timeout_interruptible(msecs_to_jiffies(10));

		}

	}

drivers/parport/ieee1284_ops.c

+4 −6
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ size_t parport_ieee1284_write_compat (struct parport *port, 
	parport_data_forward (port);

	while (count < len) {

		unsigned long expire = jiffies + dev->timeout;

		long wait = (HZ + 99) / 100;

		long wait = msecs_to_jiffies(10);

		unsigned char mask = (PARPORT_STATUS_ERROR

				      | PARPORT_STATUS_BUSY);

		unsigned char val = (PARPORT_STATUS_ERROR
@@ -97,8 +97,7 @@ size_t parport_ieee1284_write_compat (struct parport *port, 
                           our interrupt handler called. */

			if (count && no_irq) {

				parport_release (dev);

				__set_current_state (TASK_INTERRUPTIBLE);

				schedule_timeout (wait);

				schedule_timeout_interruptible(wait);

				parport_claim_or_block (dev);

			}

			else
@@ -542,13 +541,12 @@ size_t parport_ieee1284_ecp_read_data (struct parport *port, 
			/* Yield the port for a while. */

			if (count && dev->port->irq != PARPORT_IRQ_NONE) {

				parport_release (dev);

				__set_current_state (TASK_INTERRUPTIBLE);

				schedule_timeout ((HZ + 24) / 25);

				schedule_timeout_interruptible(msecs_to_jiffies(40));

				parport_claim_or_block (dev);

			}

			else

				/* We must have the device claimed here. */

				parport_wait_event (port, (HZ + 24) / 25);

				parport_wait_event (port, msecs_to_jiffies(40));



			/* Is there a signal pending? */

			if (signal_pending (current))

drivers/parport/parport_pc.c

+1 −2
Original line number Diff line number Diff line
@@ -173,8 +173,7 @@ static int change_mode(struct parport *p, int m) 
				if (time_after_eq (jiffies, expire))

					/* The FIFO is stuck. */

					return -EBUSY;

				__set_current_state (TASK_INTERRUPTIBLE);

				schedule_timeout ((HZ + 99) / 100);

				schedule_timeout_interruptible(msecs_to_jiffies(10));

				if (signal_pending (current))

					break;

			}