diff options
| -rw-r--r-- | sys/dev/usb/ehci.c | 8 | ||||
| -rw-r--r-- | sys/dev/usb/if_upgt.c | 5 | ||||
| -rw-r--r-- | sys/dev/usb/if_wi_usb.c | 5 | ||||
| -rw-r--r-- | sys/dev/usb/ohci.c | 5 | ||||
| -rw-r--r-- | sys/dev/usb/uts.c | 5 |
5 files changed, 6 insertions, 22 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index e44d123d8ab..8b09ba43e96 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci.c,v 1.97 2008/11/29 08:52:03 mglocker Exp $ */ +/* $OpenBSD: ehci.c,v 1.98 2009/02/14 20:05:09 chl Exp $ */ /* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */ /* @@ -621,7 +621,6 @@ ehci_intr1(ehci_softc_t *sc) void ehci_pcd(ehci_softc_t *sc, usbd_xfer_handle xfer) { - usbd_pipe_handle pipe; u_char *p; int i, m; @@ -630,8 +629,6 @@ ehci_pcd(ehci_softc_t *sc, usbd_xfer_handle xfer) return; } - pipe = xfer->pipe; - p = KERNADDR(&xfer->dmabuf, 0); m = min(sc->sc_noport, xfer->length * 8 - 1); memset(p, 0, xfer->length); @@ -2863,7 +2860,6 @@ ehci_abort_xfer(usbd_xfer_handle xfer, usbd_status status) if (sqtd == exfer->sqtdend) break; } - sqtd = sqtd->nextqtd; /* * Only need to alter the QH if it was pointing at a qTD * that we are removing. @@ -3654,7 +3650,6 @@ usbd_status ehci_device_isoc_start(usbd_xfer_handle xfer) { struct ehci_pipe *epipe; - usbd_device_handle dev; ehci_softc_t *sc; struct ehci_xfer *exfer; ehci_soft_itd_t *itd, *prev, *start, *stop; @@ -3670,7 +3665,6 @@ ehci_device_isoc_start(usbd_xfer_handle xfer) total_length = 0; exfer = (struct ehci_xfer *) xfer; sc = (ehci_softc_t *)xfer->pipe->device->bus; - dev = xfer->pipe->device; epipe = (struct ehci_pipe *)xfer->pipe; /* diff --git a/sys/dev/usb/if_upgt.c b/sys/dev/usb/if_upgt.c index a49bc6eadc2..5748acbeaf8 100644 --- a/sys/dev/usb/if_upgt.c +++ b/sys/dev/usb/if_upgt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upgt.c,v 1.41 2008/11/27 14:05:18 kevlo Exp $ */ +/* $OpenBSD: if_upgt.c,v 1.42 2009/02/14 20:05:09 chl Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -1338,11 +1338,8 @@ upgt_newstate_task(void *arg) struct upgt_softc *sc = arg; struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_node *ni; - enum ieee80211_state ostate; unsigned channel; - ostate = ic->ic_state; - switch (sc->sc_state) { case IEEE80211_S_INIT: DPRINTF(1, "%s: newstate is IEEE80211_S_INIT\n", diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c index 8b5711ff729..87a1255fe7c 100644 --- a/sys/dev/usb/if_wi_usb.c +++ b/sys/dev/usb/if_wi_usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_usb.c,v 1.44 2007/10/11 18:33:14 deraadt Exp $ */ +/* $OpenBSD: if_wi_usb.c,v 1.45 2009/02/14 20:05:09 chl Exp $ */ /* * Copyright (c) 2003 Dale Rahn. All rights reserved. @@ -517,7 +517,6 @@ wi_send_packet(struct wi_usb_softc *sc, int id) (rnd_len > WI_USB_BUFSZ )){ printf("invalid packet len: %x memsz %x max %x\n", total_len, sc->wi_usb_txmemsize[id], WI_USB_BUFSZ); - total_len = sc->wi_usb_txmemsize[id]; err = EIO; goto err_ret; @@ -628,8 +627,6 @@ wi_cmd_usb(struct wi_softc *wsc, int cmd, int val0, int val1, int val2) bzero(((char*)pcmd)+total_len, rnd_len - total_len); - total_len = rnd_len; - usbd_setup_xfer(c->wi_usb_xfer, sc->wi_usb_ep[WI_USB_ENDPT_TX], c, c->wi_usb_buf, rnd_len, USBD_FORCE_SHORT_XFER | USBD_NO_COPY, WI_USB_TX_TIMEOUT, wi_usb_txeof); diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 06e6de93025..2e739091909 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci.c,v 1.89 2008/11/21 17:08:42 deraadt Exp $ */ +/* $OpenBSD: ohci.c,v 1.90 2009/02/14 20:05:09 chl Exp $ */ /* $NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $ */ /* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */ @@ -1545,7 +1545,6 @@ ohci_device_bulk_done(usbd_xfer_handle xfer) void ohci_rhsc(ohci_softc_t *sc, usbd_xfer_handle xfer) { - usbd_pipe_handle pipe; u_char *p; int i, m; int hstatus; @@ -1559,8 +1558,6 @@ ohci_rhsc(ohci_softc_t *sc, usbd_xfer_handle xfer) return; } - pipe = xfer->pipe; - p = KERNADDR(&xfer->dmabuf, 0); m = min(sc->sc_noport, xfer->length * 8 - 1); memset(p, 0, xfer->length); diff --git a/sys/dev/usb/uts.c b/sys/dev/usb/uts.c index 1bb8a81bcdb..6776a60a4d7 100644 --- a/sys/dev/usb/uts.c +++ b/sys/dev/usb/uts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uts.c,v 1.23 2008/12/29 16:29:42 miod Exp $ */ +/* $OpenBSD: uts.c,v 1.24 2009/02/14 20:05:09 chl Exp $ */ /* * Copyright (c) 2007 Robert Nagy <robert@openbsd.org> @@ -151,7 +151,7 @@ uts_attach(struct device *parent, struct device *self, void *aux) usb_interface_descriptor_t *id; usb_endpoint_descriptor_t *ed; struct wsmousedev_attach_args a; - int i, found; + int i; sc->sc_udev = uaa->device; sc->sc_product = uaa->product; @@ -191,7 +191,6 @@ uts_attach(struct device *parent, struct device *self, void *aux) /* Find the interrupt endpoint */ id = usbd_get_interface_descriptor(sc->sc_iface); sc->sc_iface_number = id->bInterfaceNumber; - found = 0; for (i = 0; i < id->bNumEndpoints; i++) { ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i); |