Module Name: src Committed By: uebayasi Date: Sun Nov 1 07:23:13 UTC 2009
Modified Files: src/sys/dev/usb: ehci.c Log Message: Fix some whitespaces. To generate a diff of this commit: cvs rdiff -u -r1.160 -r1.161 src/sys/dev/usb/ehci.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/ehci.c diff -u src/sys/dev/usb/ehci.c:1.160 src/sys/dev/usb/ehci.c:1.161 --- src/sys/dev/usb/ehci.c:1.160 Sun Nov 1 06:36:44 2009 +++ src/sys/dev/usb/ehci.c Sun Nov 1 07:23:13 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ehci.c,v 1.160 2009/11/01 06:36:44 uebayasi Exp $ */ +/* $NetBSD: ehci.c,v 1.161 2009/11/01 07:23:13 uebayasi Exp $ */ /* * Copyright (c) 2004-2008 The NetBSD Foundation, Inc. @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.160 2009/11/01 06:36:44 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.161 2009/11/01 07:23:13 uebayasi Exp $"); #include "ohci.h" #include "uhci.h" @@ -507,7 +507,7 @@ sc->sc_async_head = sqh; EOWRITE4(sc, EHCI_ASYNCLISTADDR, sqh->physaddr | EHCI_LINK_QH); - callout_init(&(sc->sc_tmo_intrlist), 0); + callout_init(&(sc->sc_tmo_intrlist), 0); mutex_init(&sc->sc_doorbell_lock, MUTEX_DEFAULT, IPL_NONE); @@ -691,7 +691,7 @@ /* Schedule a callout to catch any dropped transactions. */ if ((sc->sc_flags & EHCIF_DROPPED_INTR_WORKAROUND) && !TAILQ_EMPTY(&sc->sc_intrhead)) - callout_reset(&(sc->sc_tmo_intrlist), + callout_reset(&(sc->sc_tmo_intrlist), (hz), (ehci_intrlist_timeout), (sc)); #ifdef USB_USE_SOFTINTR @@ -778,7 +778,7 @@ } done: DPRINTFN(12, ("ehci_check_intr: ex=%p done\n", ex)); - callout_stop(&(ex->xfer.timeout_handle)); + callout_stop(&(ex->xfer.timeout_handle)); ehci_idone(ex); } @@ -825,7 +825,7 @@ return; done: DPRINTFN(12, ("ehci_check_itd_intr: ex=%p done\n", ex)); - callout_stop(&(ex->xfer.timeout_handle)); + callout_stop(&(ex->xfer.timeout_handle)); ehci_idone(ex); } @@ -1084,7 +1084,7 @@ if (rv != 0) return (rv); - callout_stop(&(sc->sc_tmo_intrlist)); + callout_stop(&(sc->sc_tmo_intrlist)); usb_delay_ms(&sc->sc_bus, 300); /* XXX let stray task complete */ @@ -2863,7 +2863,7 @@ /* If we're dying, just do the software part. */ s = splusb(); xfer->status = status; /* make software ignore it */ - callout_stop(&(xfer->timeout_handle)); + callout_stop(&(xfer->timeout_handle)); usb_transfer_complete(xfer); splx(s); return; @@ -2897,7 +2897,7 @@ */ s = splusb(); xfer->status = status; /* make software ignore it */ - callout_stop(&(xfer->timeout_handle)); + callout_stop(&(xfer->timeout_handle)); usb_syncmem(&sqh->dma, sqh->offs + offsetof(ehci_qh_t, qh_qtd.qtd_status), @@ -3013,7 +3013,7 @@ if (sc->sc_dying) { s = splusb(); xfer->status = status; - callout_stop(&(xfer->timeout_handle)); + callout_stop(&(xfer->timeout_handle)); usb_transfer_complete(xfer); splx(s); return; @@ -3037,7 +3037,7 @@ xfer->hcflags |= UXFER_ABORTING; xfer->status = status; - callout_stop(&(xfer->timeout_handle)); + callout_stop(&(xfer->timeout_handle)); s = splusb(); for (itd = exfer->itdstart; itd != NULL; itd = itd->xfer_next) { @@ -3652,7 +3652,7 @@ s = splusb(); ehci_set_qh_qtd(sqh, data); /* also does usb_syncmem(sqh) */ if (xfer->timeout && !sc->sc_bus.use_polling) { - callout_reset(&(xfer->timeout_handle), (mstohz(xfer->timeout)), + callout_reset(&(xfer->timeout_handle), (mstohz(xfer->timeout)), (ehci_timeout), (xfer)); } mutex_enter(&sc->sc_intrhead_lock); @@ -3757,7 +3757,7 @@ s = splusb(); ehci_set_qh_qtd(sqh, data); /* also does usb_syncmem(sqh) */ if (xfer->timeout && !sc->sc_bus.use_polling) { - callout_reset(&(xfer->timeout_handle), + callout_reset(&(xfer->timeout_handle), (mstohz(xfer->timeout)), (ehci_timeout), (xfer)); } splx(s);