CVS commit: src/sys/dev/usb

[Masao Uebayashi]

Module Name:    src
Committed By:   uebayasi
Date:           Thu Nov 12 08:28:31 UTC 2009

Modified Files:
        src/sys/dev/usb: usbdi_util.c

Log Message:
usbd_do_request_flags(..., 0, 0, USBD_CONFIG_TIMEOUT) is equivalent to
usbd_do_request(...).  Remove an unneeded cast.  No functional changes.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/usb/usbdi_util.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/usb/usbdi_util.c
diff -u src/sys/dev/usb/usbdi_util.c:1.52 src/sys/dev/usb/usbdi_util.c:1.53
--- src/sys/dev/usb/usbdi_util.c:1.52	Sun Aug 16 13:20:40 2009
+++ src/sys/dev/usb/usbdi_util.c	Thu Nov 12 08:28:31 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi_util.c,v 1.52 2009/08/16 13:20:40 martin Exp $	*/
+/*	$NetBSD: usbdi_util.c,v 1.53 2009/11/12 08:28:31 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.52 2009/08/16 13:20:40 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.53 2009/11/12 08:28:31 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -68,8 +68,7 @@
 	USETW2(req.wValue, type, index);
 	USETW(req.wIndex, 0);
 	USETW(req.wLength, len);
-	return (usbd_do_request_flags(dev, &req, desc, 0, 0,
-	    USBD_CONFIG_TIMEOUT));
+	return (usbd_do_request(dev, &req, desc));
 }
 
 usbd_status
@@ -440,7 +439,7 @@
 		splx(s);
 		return (err);
 	}
-	error = tsleep((void *)xfer, PZERO | PCATCH, lbl, 0);
+	error = tsleep(xfer, PZERO | PCATCH, lbl, 0);
 	splx(s);
 	if (error) {
 		DPRINTF(("usbd_bulk_transfer: tsleep=%d\n", error));