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

Commit 01a527ec authored by Nishanth Aravamudan's avatar Nishanth Aravamudan Committed by Linus Torvalds
Browse files

[PATCH] drivers/acpi: fix-up schedule_timeout() usage 



Use schedule_timeout_interruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size.  Also use
msecs_to_jiffies() instead of direct HZ division to avoid rounding errors.

Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bc874d17

drivers/acpi/osl.c

+2 −4
Original line number Diff line number Diff line
@@ -313,8 +313,7 @@ acpi_status acpi_os_remove_interrupt_handler(u32 irq, acpi_osd_handler handler) 


void acpi_os_sleep(acpi_integer ms)

{

	current->state = TASK_INTERRUPTIBLE;

	schedule_timeout(((signed long)ms * HZ) / 1000);

	schedule_timeout_interruptible(msecs_to_jiffies(ms));

}



EXPORT_SYMBOL(acpi_os_sleep);
@@ -838,8 +837,7 @@ acpi_status acpi_os_wait_semaphore(acpi_handle handle, u32 units, u16 timeout) 


			ret = down_trylock(sem);

			for (i = timeout; (i > 0 && ret < 0); i -= quantum_ms) {

				current->state = TASK_INTERRUPTIBLE;

				schedule_timeout(1);

				schedule_timeout_interruptible(1);

				ret = down_trylock(sem);

			}