[src/trunk]: src/sys/external/bsd/dwc2 Make this compile for more option comb...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/77f0c529e819
branches:  trunk
changeset: 790492:77f0c529e819
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Oct 15 07:38:37 2013 +0000

description:
Make this compile for more option combinations.

diffstat:

 sys/external/bsd/dwc2/dwc2.c |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (48 lines):

diff -r 1d12e4c09a2d -r 77f0c529e819 sys/external/bsd/dwc2/dwc2.c
--- a/sys/external/bsd/dwc2/dwc2.c      Tue Oct 15 07:37:54 2013 +0000
+++ b/sys/external/bsd/dwc2/dwc2.c      Tue Oct 15 07:38:37 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dwc2.c,v 1.11 2013/10/15 07:37:54 skrll Exp $  */
+/*     $NetBSD: dwc2.c,v 1.12 2013/10/15 07:38:37 skrll Exp $  */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.11 2013/10/15 07:37:54 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.12 2013/10/15 07:38:37 skrll Exp $");
 
 #include "opt_usb.h"
 
@@ -130,7 +130,6 @@
 Static void            dwc2_device_isoc_done(usbd_xfer_handle);
 
 Static usbd_status     dwc2_device_start(usbd_xfer_handle);
-Static void            dwc2_device_close(usbd_pipe_handle);
 
 Static void            dwc2_close_pipe(usbd_pipe_handle);
 Static void            dwc2_abort_xfer(usbd_xfer_handle, usbd_status);
@@ -520,10 +519,9 @@
 Static void
 dwc2_close_pipe(usbd_pipe_handle pipe)
 {
-       struct dwc2_pipe *dpipe = (struct dwc2_pipe *)pipe;
+#ifdef DIAGNOSTIC
        struct dwc2_softc *sc = pipe->device->bus->hci_private;
-
-       dpipe = dpipe;
+#endif
 
        KASSERT(mutex_owned(&sc->sc_lock));
 }
@@ -1546,7 +1544,7 @@
 }
 
 /***********************************************************************/
-Static int
+int
 dwc2_init(struct dwc2_softc *sc)
 {
        int err = 0;