linux-hotplug.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Mierswa <impulze@impulze.org>
To: linux-hotplug@vger.kernel.org
Subject: Re: [PATCH] Use nanosleep() instead of usleep()
Date: Mon, 24 Aug 2009 17:23:33 +0000	[thread overview]
Message-ID: <4A92CC95.6040608@impulze.org> (raw)
In-Reply-To: <4A896729.3010302@impulze.org>

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

On 24.08.2009 18:41, Scott James Remnant wrote:
> Why not just use nanosleep() unconditionally?
Here we go, reworked patch with unconditional replacement.

[-- Attachment #2: 0001-Use-nanosleep-instead-of-usleep.patch --]
[-- Type: text/x-patch, Size: 21058 bytes --]

From d44a17fc464b973f0c60843a97464b5722d32bdd Mon Sep 17 00:00:00 2001
From: Daniel Mierswa <impulze@impulze.org>
Date: Mon, 17 Aug 2009 16:02:59 +0200
Subject: [PATCH] Use nanosleep() instead of usleep()

POSIX.1-2001  declares usleep() function obsolete and POSIX.1-2008
removes it. Replace all usleep code with nanosleep equivalent.

Signed-off-by: Daniel Mierswa <impulze@impulze.org>
---
 extras/modem-modeswitch/ma8280p_us.c |  333 +++++++++++++++++-----------------
 extras/scsi_id/scsi_serial.c         |    5 +-
 udev/udev-event.c                    |    5 +-
 udev/udev-rules.c                    |    5 +-
 udev/udevadm-settle.c                |    5 +-
 5 files changed, 186 insertions(+), 167 deletions(-)

diff --git a/extras/modem-modeswitch/ma8280p_us.c b/extras/modem-modeswitch/ma8280p_us.c
index 13d1116..9224435 100644
--- a/extras/modem-modeswitch/ma8280p_us.c
+++ b/extras/modem-modeswitch/ma8280p_us.c
@@ -92,6 +92,13 @@
 #include "utils.h"
 #include "ma8280p_us.h"
 
+/* suspend the process execution for msec milliseconds */
+static void msuspend(unsigned short msec)
+{
+	struct timespec duration = { 0, msec * 1000 * 1000 };
+	nanosleep(&duration, NULL);
+}
+
 int ma8280p_switch (struct usb_dev_handle *devh, struct usb_device *dev)
 {
 	int ret = 1;
@@ -104,11 +111,11 @@ int ma8280p_switch (struct usb_dev_handle *devh, struct usb_device *dev)
 	}
 
 	ret = usb_get_descriptor(devh, 0x0000001, 0x0000000, buf, 0x0000012);
-	usleep(6*1000);
+	msuspend(6);
 	ret = usb_get_descriptor(devh, 0x0000001, 0x0000000, buf, 0x0000012);
-	usleep(6*1000);
+	msuspend(6);
 	ret = usb_get_descriptor(devh, 0x0000002, 0x0000000, buf, 0x0000400);
-	usleep(10*1000);
+	msuspend(10);
 	ret = usb_release_interface(devh, 0);
 	if (ret != 0) 
 		debug ("%s: failed to release interface before set_configuration: %d", dev->filename, ret);
@@ -117,335 +124,335 @@ int ma8280p_switch (struct usb_dev_handle *devh, struct usb_device *dev)
 	if (ret != 0) 
 		debug ("%s: claim after set_configuration failed with error %d", dev->filename, ret);
 	//ret = usb_set_altinterface(devh, 0);
-	//usleep(33*1000);
+	//msuspend(33);
 	ret = usb_control_msg(devh, USB_TYPE_CLASS + USB_RECIP_INTERFACE + USB_ENDPOINT_IN, 0x0000001, 0x0000300, 0x0000000, buf, 0x0000008, 1000);
-	usleep(5*1000);
+	msuspend(5);
 	memcpy(buf, "\xb0\x04\x00\x00\x02\x90\x26\x86", 0x0000008);
 	ret = usb_control_msg(devh, USB_TYPE_CLASS + USB_RECIP_INTERFACE, 0x0000009, 0x0000300, 0x0000000, buf, 0x0000008, 1000);
-	usleep(4*1000);
+	msuspend(4);
 	memcpy(buf, "\xb0\x04\x00\x00\x02\x90\x26\x86", 0x0000008);
 	ret = usb_control_msg(devh, USB_TYPE_CLASS + USB_RECIP_INTERFACE, 0x0000009, 0x0000300, 0x0000000, buf, 0x0000008, 1000);
-	usleep(4*1000);
+	msuspend(4);
 
-	usleep(4*1000);
+	msuspend(4);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(6*1000);
+	msuspend(6);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(1*1000);
+	msuspend(1);
 	//URB_FUNCTION_GET_STATUS_FROM_ENDPOINT skipped
-	usleep(4*1000);
+	msuspend(4);
 	memcpy(buf, "\x37\x01\xfe\xdb\xc1\x33\x1f\x83", 0x0000008);
 	ret = usb_interrupt_write(devh, 0x00000002, buf, 0x0000008, 1000);
-	usleep(3*1000);
+	msuspend(3);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(1*1000);
+	msuspend(1);
 	memcpy(buf, "\x37\x0e\xb5\x9d\x3b\x8a\x91\x51", 0x0000008);
 	ret = usb_interrupt_write(devh, 0x00000002, buf, 0x0000008, 1000);
-	usleep(7*1000);
+	msuspend(7);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(1*1000);
+	msuspend(1);
 	memcpy(buf, "\x34\x87\xba\x0d\xfc\x8a\x91\x51", 0x0000008);
 	ret = usb_interrupt_write(devh, 0x00000002, buf, 0x0000008, 1000);
-	usleep(7*1000);
+	msuspend(7);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(2*1000);
+	msuspend(2);
 	//URB_FUNCTION_GET_STATUS_FROM_ENDPOINT skipped
-	usleep(4*1000);
+	msuspend(4);
 	memcpy(buf, "\x37\x01\xfe\xdb\xc1\x33\x1f\x83", 0x0000008);
 	ret = usb_interrupt_write(devh, 0x00000002, buf, 0x0000008, 1000);
-	usleep(2*1000);
+	msuspend(2);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(1*1000);
+	msuspend(1);
 	memcpy(buf, "\x37\x0e\xb5\x9d\x3b\x8a\x91\x51", 0x0000008);
 	ret = usb_interrupt_write(devh, 0x00000002, buf, 0x0000008, 1000);
-	usleep(7*1000);
+	msuspend(7);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(1*1000);
+	msuspend(1);
 	memcpy(buf, "\x34\x87\xba\x0d\xfc\x8a\x91\x51", 0x0000008);
 	ret = usb_interrupt_write(devh, 0x00000002, buf, 0x0000008, 1000);
-	usleep(7*1000);
+	msuspend(7);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(8*1000);
+	msuspend(8);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(1*1000);
+	msuspend(1);
 	//URB_FUNCTION_GET_STATUS_FROM_ENDPOINT skipped
-	usleep(4*1000);
+	msuspend(4);
 	memcpy(buf, "\x33\x04\xfe\x00\xf4\x6c\x1f\xf0", 0x0000008);
 	ret = usb_interrupt_write(devh, 0x00000002, buf, 0x0000008, 1000);
-	usleep(3*1000);
+	msuspend(3);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
-	usleep(1*1000);
+	msuspend(1);
 	//URB_FUNCTION_GET_STATUS_FROM_ENDPOINT skipped
-	usleep(4*1000);
+	msuspend(4);
 	memcpy(buf, "\x32\x07\xfe\xf0\x29\xb9\x3a\xf0", 0x0000008);
 	ret = usb_interrupt_write(devh, 0x00000002, buf, 0x0000008, 1000);
-	usleep(3*1000);
+	msuspend(3);
 	ret = usb_interrupt_read(devh, 0x00000081, buf, 0x0000008, 1000);
 
 	if (buf)
diff --git a/extras/scsi_id/scsi_serial.c b/extras/scsi_id/scsi_serial.c
index 0f883dc..8abe2b0 100644
--- a/extras/scsi_id/scsi_serial.c
+++ b/extras/scsi_id/scsi_serial.c
@@ -852,7 +852,10 @@ int scsi_get_serial(struct udev *udev,
 		info(udev, "%s: cannot open %s: %s\n", dev_scsi->kernel, devname, strerror(errno));
 		if (errno != EBUSY)
 			break;
-		usleep(500000 + (rand() % 100000) );
+		{
+			struct timespec duration = { 0, 500 * 1000 * 1000 + (rand() % (100 * 1000 * 1000)) };
+			nanosleep(&duration, NULL);
+		}
 	}
 	if (fd < 0)
 		return 1;
diff --git a/udev/udev-event.c b/udev/udev-event.c
index 3a6c71a..36cc7b7 100644
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -518,7 +518,10 @@ static int rename_netif(struct udev_event *event)
 			}
 			dbg(event->udev, "wait for netif '%s' to become free, loop=%i\n",
 			    event->name, (90 * 20) - loop);
-			usleep(1000 * 1000 / 20);
+			{
+				struct timespec duration = { 0, 1000 * 1000 * 1000 / 20 };
+				nanosleep(&duration, NULL);
+			}
 		}
 	}
 exit:
diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index eeb71bc..fa14d79 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -825,7 +825,10 @@ static int wait_for_file(struct udev_device *dev, const char *file, int timeout)
 			return -2;
 		}
 		info(udev, "wait for '%s' for %i mseconds\n", file, 1000 / WAIT_LOOP_PER_SECOND);
-		usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
+		{
+			struct timespec duration = { 0, 1000 * 1000 * 1000 / WAIT_LOOP_PER_SECOND };
+			nanosleep(&duration, NULL);
+		}
 	}
 	info(udev, "waiting for '%s' failed\n", file);
 	return -1;
diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index 6828192..7a11a52 100644
--- a/udev/udevadm-settle.c
+++ b/udev/udevadm-settle.c
@@ -203,7 +203,10 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 		if (is_timeout)
 			break;
 
-		usleep(1000 * 1000 / LOOP_PER_SECOND);
+		{
+			struct timespec duration = { 0 , 1000 * 1000 * 1000 / LOOP_PER_SECOND };
+			nanosleep(&duration, NULL);
+		}
 	}
 
 	/* if we reached the timeout, print the list of remaining events */
-- 
1.6.4.1


      parent reply	other threads:[~2009-08-24 17:23 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-17 14:20 [PATCH] Use nanosleep() instead of usleep() Daniel Mierswa
2009-08-18  0:22 ` Kay Sievers
2009-08-18  5:08 ` Daniel Mierswa
2009-08-19  2:17 ` Kay Sievers
2009-08-19  5:35 ` Daniel Mierswa
2009-08-24 16:41 ` Scott James Remnant
2009-08-24 17:23 ` Daniel Mierswa [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4A92CC95.6040608@impulze.org \
    --to=impulze@impulze.org \
    --cc=linux-hotplug@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).