svn commit: r213347 - in user/weongyo/usb/sys/dev/usb: . controller input misc net serial storage template wlan

Weongyo Jeong weongyo at FreeBSD.org
Sat Oct 2 06:43:40 UTC 2010 

Author: weongyo
Date: Sat Oct  2 06:43:39 2010
New Revision: 213347
URL: http://svn.freebsd.org/changeset/base/213347

Log:
  no braces for single statement.

Modified:
  user/weongyo/usb/sys/dev/usb/controller/at91dci.c
  user/weongyo/usb/sys/dev/usb/controller/at91dci_atmelarm.c
  user/weongyo/usb/sys/dev/usb/controller/atmegadci.c
  user/weongyo/usb/sys/dev/usb/controller/avr32dci.c
  user/weongyo/usb/sys/dev/usb/controller/ehci.c
  user/weongyo/usb/sys/dev/usb/controller/musb_otg.c
  user/weongyo/usb/sys/dev/usb/controller/musb_otg_atmelarm.c
  user/weongyo/usb/sys/dev/usb/controller/ohci.c
  user/weongyo/usb/sys/dev/usb/controller/uhci.c
  user/weongyo/usb/sys/dev/usb/controller/uss820dci.c
  user/weongyo/usb/sys/dev/usb/input/atp.c
  user/weongyo/usb/sys/dev/usb/input/uep.c
  user/weongyo/usb/sys/dev/usb/input/uhid.c
  user/weongyo/usb/sys/dev/usb/input/ukbd.c
  user/weongyo/usb/sys/dev/usb/input/ums.c
  user/weongyo/usb/sys/dev/usb/misc/udbp.c
  user/weongyo/usb/sys/dev/usb/net/if_axe.c
  user/weongyo/usb/sys/dev/usb/net/if_cdce.c
  user/weongyo/usb/sys/dev/usb/net/if_udav.c
  user/weongyo/usb/sys/dev/usb/serial/ucycom.c
  user/weongyo/usb/sys/dev/usb/serial/ufoma.c
  user/weongyo/usb/sys/dev/usb/serial/uftdi.c
  user/weongyo/usb/sys/dev/usb/serial/ulpt.c
  user/weongyo/usb/sys/dev/usb/serial/umodem.c
  user/weongyo/usb/sys/dev/usb/serial/uplcom.c
  user/weongyo/usb/sys/dev/usb/serial/usb_serial.c
  user/weongyo/usb/sys/dev/usb/serial/uvisor.c
  user/weongyo/usb/sys/dev/usb/serial/uvscom.c
  user/weongyo/usb/sys/dev/usb/storage/umass.c
  user/weongyo/usb/sys/dev/usb/storage/ustorage_fs.c
  user/weongyo/usb/sys/dev/usb/template/usb_template.c
  user/weongyo/usb/sys/dev/usb/usb_dev.c
  user/weongyo/usb/sys/dev/usb/usb_device.c
  user/weongyo/usb/sys/dev/usb/usb_generic.c
  user/weongyo/usb/sys/dev/usb/usb_handle_request.c
  user/weongyo/usb/sys/dev/usb/usb_hid.c
  user/weongyo/usb/sys/dev/usb/usb_hub.c
  user/weongyo/usb/sys/dev/usb/usb_msctest.c
  user/weongyo/usb/sys/dev/usb/usb_parse.c
  user/weongyo/usb/sys/dev/usb/usb_request.c
  user/weongyo/usb/sys/dev/usb/usb_transfer.c
  user/weongyo/usb/sys/dev/usb/usb_util.c
  user/weongyo/usb/sys/dev/usb/wlan/if_run.c
  user/weongyo/usb/sys/dev/usb/wlan/if_urtw.c
  user/weongyo/usb/sys/dev/usb/wlan/if_zyd.c

Modified: user/weongyo/usb/sys/dev/usb/controller/at91dci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/at91dci.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/controller/at91dci.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -202,9 +202,9 @@ at91dci_get_hw_ep_profile(struct usb_dev
     const struct usb_hw_ep_profile **ppf, uint8_t ep_addr)
 {
 
-	if (ep_addr < AT91_UDP_EP_MAX) {
+	if (ep_addr < AT91_UDP_EP_MAX)
 		*ppf = (at91dci_ep_profile + ep_addr);
-	} else
+	else
 		*ppf = NULL;
 }
 
@@ -345,15 +345,15 @@ at91dci_setup_rx(struct at91dci_td *td)
 
 	/* sneak peek the set address */
 	if ((req.bmRequestType == UT_WRITE_DEVICE) &&
-	    (req.bRequest == UR_SET_ADDRESS)) {
+	    (req.bRequest == UR_SET_ADDRESS))
 		sc->sc_dv_addr = req.wValue[0] & 0x7F;
-	} else
+	else
 		sc->sc_dv_addr = 0xFF;
 
 	/* sneak peek the endpoint direction */
-	if (req.bmRequestType & UE_DIR_IN) {
+	if (req.bmRequestType & UE_DIR_IN)
 		csr |= AT91_UDP_CSR_DIR;
-	} else
+	else
 		csr &= ~AT91_UDP_CSR_DIR;
 
 	/* write the direction of the control transfer */
@@ -659,9 +659,9 @@ at91dci_xfer_do_fifo(struct usb_xfer *xf
 		}
 		if (((void *)td) == xfer->td_transfer_last)
 			goto done;
-		if (td->error) {
+		if (td->error)
 			goto done;
-		} else if (td->remainder > 0) {
+		else if (td->remainder > 0) {
 			/*
 			 * We had a short transfer. If there is no alternate
 			 * next, stop processing !
@@ -687,9 +687,9 @@ done:
 	temp = (xfer->endpointno & UE_ADDR);
 
 	/* update FIFO bank flag and multi buffer */
-	if (td->fifo_bank) {
+	if (td->fifo_bank)
 		sc->sc_ep_flags[temp].fifo_bank = 1;
-	} else
+	else
 		sc->sc_ep_flags[temp].fifo_bank = 0;
 
 	/* compute all actual lengths */
@@ -934,9 +934,9 @@ at91dci_setup_standard_chain(struct usb_
 
 		at91dci_setup_standard_chain_sub(&temp);
 
-		if ((xfer->status & XFER_STATUS_ISOCXFER) != 0) {
+		if ((xfer->status & XFER_STATUS_ISOCXFER) != 0)
 			temp.offset += temp.len;
-		} else {
+		else {
 			/* get next Page Cache pointer */
 			temp.pc = xfer->frbuffers + x;
 		}
@@ -1069,9 +1069,9 @@ at91dci_standard_done_sub(struct usb_xfe
 		         * Verify the length and subtract
 		         * the remainder from "frlengths[]":
 		         */
-			if (len > xfer->frlengths[xfer->aframes]) {
+			if (len > xfer->frlengths[xfer->aframes])
 				td->error = 1;
-			} else
+			else
 				xfer->frlengths[xfer->aframes] -= len;
 		}
 		/* Check for transfer error */
@@ -1085,9 +1085,9 @@ at91dci_standard_done_sub(struct usb_xfe
 		if (len > 0) {
 			if ((xfer->status & XFER_STATUS_SHORTFRAME_OK) != 0) {
 				/* follow alt next */
-				if (td->alt_next) {
+				if (td->alt_next)
 					td = td->obj_next;
-				} else
+				else
 					td = NULL;
 			} else {
 				/* the transfer is finished */
@@ -1274,14 +1274,14 @@ at91dci_clear_stall_sub(struct at91dci_s
 	csr_val &= ~AT91_UDP_CSR_ET_MASK;
 	csr_val |= AT91_UDP_CSR_EPEDS;
 
-	if (ep_type == UE_CONTROL) {
+	if (ep_type == UE_CONTROL)
 		csr_val |= AT91_UDP_CSR_ET_CTRL;
-	} else {
-		if (ep_type == UE_BULK) {
+	else {
+		if (ep_type == UE_BULK)
 			csr_val |= AT91_UDP_CSR_ET_BULK;
-		} else if (ep_type == UE_INTERRUPT) {
+		else if (ep_type == UE_INTERRUPT)
 			csr_val |= AT91_UDP_CSR_ET_INT;
-		} else
+		else
 			csr_val |= AT91_UDP_CSR_ET_ISO;
 		if (ep_dir & UE_DIR_IN)
 			csr_val |= AT91_UDP_CSR_ET_DIR_IN;

Modified: user/weongyo/usb/sys/dev/usb/controller/at91dci_atmelarm.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/at91dci_atmelarm.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/controller/at91dci_atmelarm.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -236,9 +236,9 @@ at91_udp_attach(device_t dev)
 	err = at91dci_init(&sc->sc_dci);
 	if (!err)
 		err = device_probe_and_attach(sc->sc_dci.sc_bus.bdev);
-	if (err) {
+	if (err)
 		goto error;
-	} else {
+	else {
 		/* poll VBUS one time */
 		at91_vbus_poll(sc);
 	}

Modified: user/weongyo/usb/sys/dev/usb/controller/atmegadci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/atmegadci.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/controller/atmegadci.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -571,9 +571,9 @@ atmegadci_xfer_do_fifo(struct usb_xfer *
 		}
 		if (((void *)td) == xfer->td_transfer_last)
 			goto done;
-		if (td->error) {
+		if (td->error)
 			goto done;
-		} else if (td->remainder > 0) {
+		else if (td->remainder > 0) {
 			/*
 			 * We had a short transfer. If there is no alternate
 			 * next, stop processing !
@@ -847,9 +847,9 @@ atmegadci_setup_standard_chain(struct us
 
 		atmegadci_setup_standard_chain_sub(&temp);
 
-		if ((xfer->status & XFER_STATUS_ISOCXFER) != 0) {
+		if ((xfer->status & XFER_STATUS_ISOCXFER) != 0)
 			temp.offset += temp.len;
-		} else {
+		else {
 			/* get next Page Cache pointer */
 			temp.pc = xfer->frbuffers + x;
 		}
@@ -962,9 +962,9 @@ atmegadci_standard_done_sub(struct usb_x
 		         * Verify the length and subtract
 		         * the remainder from "frlengths[]":
 		         */
-			if (len > xfer->frlengths[xfer->aframes]) {
+			if (len > xfer->frlengths[xfer->aframes])
 				td->error = 1;
-			} else
+			else
 				xfer->frlengths[xfer->aframes] -= len;
 		}
 		/* Check for transfer error */
@@ -978,9 +978,9 @@ atmegadci_standard_done_sub(struct usb_x
 		if (len > 0) {
 			if ((xfer->status & XFER_STATUS_SHORTFRAME_OK) != 0) {
 				/* follow alt next */
-				if (td->alt_next) {
+				if (td->alt_next)
 					td = td->obj_next;
-				} else
+				else
 					td = NULL;
 			} else {
 				/* the transfer is finished */
@@ -1131,11 +1131,11 @@ atmegadci_clear_stall_sub(struct atmegad
 	    ATMEGA_UECONX_STALLRQC);
 
 	do {
-		if (ep_type == UE_BULK) {
+		if (ep_type == UE_BULK)
 			temp = ATMEGA_UECFG0X_EPTYPE2;
-		} else if (ep_type == UE_INTERRUPT) {
+		else if (ep_type == UE_INTERRUPT)
 			temp = ATMEGA_UECFG0X_EPTYPE3;
-		} else
+		else
 			temp = ATMEGA_UECFG0X_EPTYPE1;
 		if (ep_dir & UE_DIR_IN)
 			temp |= ATMEGA_UECFG0X_EPDIR;

Modified: user/weongyo/usb/sys/dev/usb/controller/avr32dci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/avr32dci.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/controller/avr32dci.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -562,9 +562,9 @@ avr32dci_xfer_do_fifo(struct usb_xfer *x
 		}
 		if (((void *)td) == xfer->td_transfer_last)
 			goto done;
-		if (td->error) {
+		if (td->error)
 			goto done;
-		} else if (td->remainder > 0) {
+		else if (td->remainder > 0) {
 			/*
 			 * We had a short transfer. If there is no alternate
 			 * next, stop processing !
@@ -818,9 +818,9 @@ avr32dci_setup_standard_chain(struct usb
 
 		avr32dci_setup_standard_chain_sub(&temp);
 
-		if ((xfer->status & XFER_STATUS_ISOCXFER) != 0) {
+		if ((xfer->status & XFER_STATUS_ISOCXFER) != 0)
 			temp.offset += temp.len;
-		} else {
+		else {
 			/* get next Page Cache pointer */
 			temp.pc = xfer->frbuffers + x;
 		}
@@ -936,9 +936,9 @@ avr32dci_standard_done_sub(struct usb_xf
 		         * Verify the length and subtract
 		         * the remainder from "frlengths[]":
 		         */
-			if (len > xfer->frlengths[xfer->aframes]) {
+			if (len > xfer->frlengths[xfer->aframes])
 				td->error = 1;
-			} else
+			else
 				xfer->frlengths[xfer->aframes] -= len;
 		}
 		/* Check for transfer error */
@@ -952,9 +952,9 @@ avr32dci_standard_done_sub(struct usb_xf
 		if (len > 0) {
 			if ((xfer->status & XFER_STATUS_SHORTFRAME_OK) != 0) {
 				/* follow alt next */
-				if (td->alt_next) {
+				if (td->alt_next)
 					td = td->obj_next;
-				} else
+				else
 					td = NULL;
 			} else {
 				/* the transfer is finished */
@@ -1088,14 +1088,12 @@ avr32dci_clear_stall_sub(struct avr32dci
 	/* clear stall */
 	AVR32_WRITE_4(sc, AVR32_EPTCLRSTA(ep_no), AVR32_EPTSTA_FRCESTALL);
 
-	if (ep_type == UE_BULK) {
+	if (ep_type == UE_BULK)
 		temp = AVR32_EPTCFG_TYPE_BULK;
-	} else if (ep_type == UE_INTERRUPT) {
+	else if (ep_type == UE_INTERRUPT)
 		temp = AVR32_EPTCFG_TYPE_INTR;
-	} else {
-		temp = AVR32_EPTCFG_TYPE_ISOC |
-		    AVR32_EPTCFG_NB_TRANS(1);
-	}
+	else
+		temp = AVR32_EPTCFG_TYPE_ISOC | AVR32_EPTCFG_NB_TRANS(1);
 	if (ep_dir & UE_DIR_IN)
 		temp |= AVR32_EPTCFG_EPDIR_IN;
 	avr32dci_get_hw_ep_profile(NULL, &pf, ep_no);
@@ -1119,9 +1117,9 @@ avr32dci_clear_stall_sub(struct avr32dci
 
 	temp = AVR32_READ_4(sc, AVR32_EPTCFG(ep_no));
 
-	if (!(temp & AVR32_EPTCFG_EPT_MAPD)) {
+	if (!(temp & AVR32_EPTCFG_EPT_MAPD))
 		device_printf(sc->sc_bus.bdev, "Chip rejected configuration\n");
-	} else {
+	else {
 		AVR32_WRITE_4(sc, AVR32_EPTCTLENB(ep_no),
 		    AVR32_EPTCTL_EPT_ENABL);
 	}

Modified: user/weongyo/usb/sys/dev/usb/controller/ehci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ehci.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/controller/ehci.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -1733,9 +1733,9 @@ restart:
 		precompute = 0;
 
 		/* setup alt next pointer, if any */
-		if (temp->last_frame) {
+		if (temp->last_frame)
 			td_alt_next = NULL;
-		} else {
+		else {
 			/* we use this field internally */
 			td_alt_next = td_next;
 		}
@@ -1935,9 +1935,9 @@ ehci_setup_standard_chain(struct usb_xfe
 		if (methods != &ehci_device_intr_methods)
 			qh_endp |= EHCI_QH_SET_NRL(8);
 	} else {
-		if (usbd_get_speed(xfer->xroot->udev) == USB_SPEED_FULL) {
+		if (usbd_get_speed(xfer->xroot->udev) == USB_SPEED_FULL)
 			qh_endp |= EHCI_QH_SET_EPS(EHCI_QH_SPEED_FULL);
-		} else
+		else
 			qh_endp |= EHCI_QH_SET_EPS(EHCI_QH_SPEED_LOW);
 
 		if (methods == &ehci_device_ctrl_methods)
@@ -2043,9 +2043,9 @@ ehci_isoc_fs_done(ehci_softc_t *sc, stru
 
 		DPRINTFN(2, "status=0x%08x, rem=%u\n", status, len);
 
-		if (*plen >= len) {
+		if (*plen >= len)
 			len = *plen - len;
-		} else
+		else
 			len = 0;
 
 		*plen = len;
@@ -2557,9 +2557,9 @@ ehci_device_isoc_fs_enter(struct usb_xfe
 
 			tlen += sa;
 
-			if (tlen >= 8) {
+			if (tlen >= 8)
 				sb = 0;
-			} else
+			else
 				sb = (1 << tlen);
 
 			sa = (1 << sa);
@@ -3660,9 +3660,9 @@ ehci_ep_init(struct usb_device *udev, st
 			ep->methods = &ehci_device_intr_methods;
 			break;
 		case UE_ISOCHRONOUS:
-			if (udev->speed == USB_SPEED_HIGH) {
+			if (udev->speed == USB_SPEED_HIGH)
 				ep->methods = &ehci_device_isoc_hs_methods;
-			} else if (udev->speed == USB_SPEED_FULL)
+			else if (udev->speed == USB_SPEED_FULL)
 				ep->methods = &ehci_device_isoc_fs_methods;
 			break;
 		case UE_BULK:

Modified: user/weongyo/usb/sys/dev/usb/controller/musb_otg.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/musb_otg.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/controller/musb_otg.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -322,9 +322,9 @@ musbotg_setup_rx(struct musbotg_td *td)
 
 	/* sneak peek the set address */
 	if ((req.bmRequestType == UT_WRITE_DEVICE) &&
-	    (req.bRequest == UR_SET_ADDRESS)) {
+	    (req.bRequest == UR_SET_ADDRESS))
 		sc->sc_dv_addr = req.wValue[0] & 0x7F;
-	} else
+	else
 		sc->sc_dv_addr = 0xFF;
 	return (0);			/* complete */
 
@@ -888,9 +888,9 @@ musbotg_xfer_do_fifo(struct usb_xfer *xf
 		}
 		if (((void *)td) == xfer->td_transfer_last)
 			goto done;
-		if (td->error) {
+		if (td->error)
 			goto done;
-		} else if (td->remainder > 0) {
+		else if (td->remainder > 0) {
 			/*
 			 * We had a short transfer. If there is no alternate
 			 * next, stop processing !
@@ -1169,9 +1169,9 @@ musbotg_setup_standard_chain(struct usb_
 
 		musbotg_setup_standard_chain_sub(&temp);
 
-		if ((xfer->status & XFER_STATUS_ISOCXFER) != 0) {
+		if ((xfer->status & XFER_STATUS_ISOCXFER) != 0)
 			temp.offset += temp.len;
-		} else {
+		else {
 			/* get next Page Cache pointer */
 			temp.pc = xfer->frbuffers + x;
 		}
@@ -1310,9 +1310,9 @@ musbotg_standard_done_sub(struct usb_xfe
 		         * Verify the length and subtract
 		         * the remainder from "frlengths[]":
 		         */
-			if (len > xfer->frlengths[xfer->aframes]) {
+			if (len > xfer->frlengths[xfer->aframes])
 				td->error = 1;
-			} else
+			else
 				xfer->frlengths[xfer->aframes] -= len;
 		}
 		/* Check for transfer error */
@@ -1326,9 +1326,9 @@ musbotg_standard_done_sub(struct usb_xfe
 		if (len > 0) {
 			if ((xfer->status & XFER_STATUS_SHORTFRAME_OK) != 0) {
 				/* follow alt next */
-				if (td->alt_next) {
+				if (td->alt_next)
 					td = td->obj_next;
-				} else
+				else
 					td = NULL;
 			} else {
 				/* the transfer is finished */
@@ -2015,9 +2015,9 @@ musbotg_device_isoc_enter(struct usb_xfe
 	 */
 	temp = (nframes - xfer->endpoint->isoc_next) & MUSB2_MASK_FRAME;
 
-	if (usbd_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) {
+	if (usbd_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH)
 		fs_frames = (xfer->nframes + 7) / 8;
-	} else
+	else
 		fs_frames = xfer->nframes;
 
 	if ((xfer->endpoint->is_synced == 0) ||

Modified: user/weongyo/usb/sys/dev/usb/controller/musb_otg_atmelarm.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/musb_otg_atmelarm.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/controller/musb_otg_atmelarm.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -154,9 +154,9 @@ musbotg_attach(device_t dev)
 	err = musbotg_init(&sc->sc_otg);
 	if (!err)
 		err = device_probe_and_attach(sc->sc_otg.sc_bus.bdev);
-	if (err) {
+	if (err)
 		goto error;
-	} else {
+	else {
 		/* poll VBUS one time */
 		musbotg_vbus_poll(sc);
 	}

Modified: user/weongyo/usb/sys/dev/usb/controller/ohci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ohci.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/controller/ohci.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -410,9 +410,9 @@ ohci_init(ohci_softc_t *sc)
 
 	sc->sc_bus.usbrev = USB_REV_1_0;
 
-	if (ohci_controller_init(sc)) {
+	if (ohci_controller_init(sc))
 		return (USB_ERR_INVAL);
-	} else {
+	else {
 		/* catch any lost interrupts */
 		ohci_do_poll(&sc->sc_bus);
 		return (USB_ERR_NORMAL_COMPLETION);
@@ -772,9 +772,9 @@ ohci_isoc_done(struct usb_xfer *xfer)
 		while (nframes--) {
 			len = le16toh(*olen);
 
-			if ((len >> 12) == OHCI_CC_NOT_ACCESSED) {
+			if ((len >> 12) == OHCI_CC_NOT_ACCESSED)
 				len = 0;
-			} else
+			else
 				len &= ((1 << 12) - 1);
 
 			if (len > *plen)
@@ -1010,9 +1010,9 @@ ohci_check_transfer_sub(struct usb_xfer 
 		 * Make sure that the OHCI re-scans the schedule by
 		 * writing the BLF and CLF bits:
 		 */
-		if (xfer->xroot->udev->flags.self_suspended) {
-			/* nothing to do */
-		} else if (xfer->endpoint->methods == &ohci_device_bulk_methods) {
+		if (xfer->xroot->udev->flags.self_suspended)
+			;	/* nothing to do */
+		else if (xfer->endpoint->methods == &ohci_device_bulk_methods) {
 			ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus);
 
 			OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_BLF);
@@ -1060,9 +1060,9 @@ ohci_check_transfer(struct usb_xfer *xfe
 				}
 			}
 			/* store data-toggle */
-			if (ed_headp & OHCI_TOGGLECARRY) {
+			if (ed_headp & OHCI_TOGGLECARRY)
 				xfer->endpoint->toggle_next = 1;
-			} else
+			else
 				xfer->endpoint->toggle_next = 0;
 
 			/* non-isochronous transfer */
@@ -1264,9 +1264,9 @@ ohci_setup_standard_chain_sub(struct ohc
 	precompute = 1;
 
 	/* software is used to detect short incoming transfers */
-	if ((temp->td_flags & htole32(OHCI_TD_DP_MASK)) == htole32(OHCI_TD_IN)) {
+	if ((temp->td_flags & htole32(OHCI_TD_DP_MASK)) == htole32(OHCI_TD_IN))
 		temp->td_flags |= htole32(OHCI_TD_R);
-	} else
+	else
 		temp->td_flags &= ~htole32(OHCI_TD_R);
 
 restart:
@@ -1439,15 +1439,15 @@ ohci_setup_standard_chain(struct usb_xfe
 	temp.td_flags = htole32(OHCI_TD_NOCC | OHCI_TD_NOINTR);
 
 	/* set data toggle */
-	if (xfer->endpoint->toggle_next) {
+	if (xfer->endpoint->toggle_next)
 		temp.td_flags |= htole32(OHCI_TD_TOGGLE_1);
-	} else
+	else
 		temp.td_flags |= htole32(OHCI_TD_TOGGLE_0);
 
 	/* set endpoint direction */
-	if (UE_GET_DIR(xfer->endpointno) == UE_DIR_IN) {
+	if (UE_GET_DIR(xfer->endpointno) == UE_DIR_IN)
 		temp.td_flags |= htole32(OHCI_TD_IN);
-	} else
+	else
 		temp.td_flags |= htole32(OHCI_TD_OUT);
 
 	while (x != xfer->nframes) {

Modified: user/weongyo/usb/sys/dev/usb/controller/uhci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/uhci.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/controller/uhci.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -1481,9 +1481,9 @@ uhci_setup_standard_chain_sub(struct uhc
 	precompute = 1;
 
 	/* software is used to detect short incoming transfers */
-	if ((temp->td_token & htole32(UHCI_TD_PID)) == htole32(UHCI_TD_PID_IN)) {
+	if ((temp->td_token & htole32(UHCI_TD_PID)) == htole32(UHCI_TD_PID_IN))
 		temp->td_status |= htole32(UHCI_TD_SPD);
-	} else
+	else
 		temp->td_status &= ~htole32(UHCI_TD_SPD);
 
 	temp->ml.buf_offset = 0;
@@ -1571,9 +1571,9 @@ restart:
 		precompute = 0;
 
 		/* setup alt next pointer, if any */
-		if (temp->last_frame) {
+		if (temp->last_frame)
 			td_alt_next = NULL;
-		} else {
+		else {
 			/* we use this field internally */
 			td_alt_next = td_next;
 		}
@@ -1774,9 +1774,9 @@ uhci_device_done(struct usb_xfer *xfer, 
 	if (methods == &uhci_device_bulk_methods)
 		UHCI_REMOVE_QH(qh, sc->sc_bulk_p_last);
 	if (methods == &uhci_device_ctrl_methods) {
-		if (xfer->xroot->udev->speed == USB_SPEED_LOW) {
+		if (xfer->xroot->udev->speed == USB_SPEED_LOW)
 			UHCI_REMOVE_QH(qh, sc->sc_ls_ctl_p_last);
-		} else
+		else
 			UHCI_REMOVE_QH(qh, sc->sc_fs_ctl_p_last);
 	}
 	if (methods == &uhci_device_intr_methods)
@@ -1894,9 +1894,9 @@ uhci_device_ctrl_start(struct usb_xfer *
 	 * transfers
 	 */
 	if (xfer->xroot->udev->flags.self_suspended == 0) {
-		if (xfer->xroot->udev->speed == USB_SPEED_LOW) {
+		if (xfer->xroot->udev->speed == USB_SPEED_LOW)
 			UHCI_APPEND_QH(qh, sc->sc_ls_ctl_p_last);
-		} else
+		else
 			UHCI_APPEND_QH(qh, sc->sc_fs_ctl_p_last);
 	} else
 		usb_pc_cpu_flush(qh->page_cache);
@@ -2989,9 +2989,9 @@ uhci_device_resume(struct usb_device *ud
 				xfer->status |= XFER_STATUS_BWRECLAIMED;
 			}
 			if (methods == &uhci_device_ctrl_methods) {
-				if (xfer->xroot->udev->speed == USB_SPEED_LOW) {
+				if (xfer->xroot->udev->speed == USB_SPEED_LOW)
 					UHCI_APPEND_QH(qh, sc->sc_ls_ctl_p_last);
-				} else
+				else
 					UHCI_APPEND_QH(qh, sc->sc_fs_ctl_p_last);
 			}
 			if (methods == &uhci_device_intr_methods)
@@ -3028,9 +3028,9 @@ uhci_device_suspend(struct usb_device *u
 			if (methods == &uhci_device_bulk_methods)
 				UHCI_REMOVE_QH(qh, sc->sc_bulk_p_last);
 			if (methods == &uhci_device_ctrl_methods) {
-				if (xfer->xroot->udev->speed == USB_SPEED_LOW) {
+				if (xfer->xroot->udev->speed == USB_SPEED_LOW)
 					UHCI_REMOVE_QH(qh, sc->sc_ls_ctl_p_last);
-				} else
+				else
 					UHCI_REMOVE_QH(qh, sc->sc_fs_ctl_p_last);
 			}
 			if (methods == &uhci_device_intr_methods)

Modified: user/weongyo/usb/sys/dev/usb/controller/uss820dci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/uss820dci.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/controller/uss820dci.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -168,15 +168,15 @@ static void
 uss820dci_get_hw_ep_profile(struct usb_device *udev,
     const struct usb_hw_ep_profile **ppf, uint8_t ep_addr)
 {
-	if (ep_addr == 0) {
+	if (ep_addr == 0)
 		*ppf = uss820dci_ep_profile + 0;
-	} else if (ep_addr < 5) {
+	else if (ep_addr < 5)
 		*ppf = uss820dci_ep_profile + 1;
-	} else if (ep_addr < 7) {
+	else if (ep_addr < 7)
 		*ppf = uss820dci_ep_profile + 2;
-	} else if (ep_addr == 7) {
+	else if (ep_addr == 7)
 		*ppf = uss820dci_ep_profile + 3;
-	} else
+	else
 		*ppf = NULL;
 }
 
@@ -322,9 +322,9 @@ uss820dci_setup_rx(struct uss820dci_td *
 
 	/* sneak peek the set address */
 	if ((req.bmRequestType == UT_WRITE_DEVICE) &&
-	    (req.bRequest == UR_SET_ADDRESS)) {
+	    (req.bRequest == UR_SET_ADDRESS))
 		sc->sc_dv_addr = req.wValue[0] & 0x7F;
-	} else
+	else
 		sc->sc_dv_addr = 0xFF;
 
 	/* reset TX FIFO */
@@ -660,9 +660,9 @@ uss820dci_xfer_do_fifo(struct usb_xfer *
 		}
 		if (((void *)td) == xfer->td_transfer_last)
 			goto done;
-		if (td->error) {
+		if (td->error)
 			goto done;
-		} else if (td->remainder > 0) {
+		else if (td->remainder > 0) {
 			/*
 			 * We had a short transfer. If there is no alternate
 			 * next, stop processing !
@@ -870,9 +870,9 @@ uss820dci_setup_standard_chain(struct us
 		x = 0;
 
 	if (x != xfer->nframes) {
-		if (xfer->endpointno & UE_DIR_IN) {
+		if (xfer->endpointno & UE_DIR_IN)
 			temp.func = &uss820dci_data_tx;
-		} else
+		else
 			temp.func = &uss820dci_data_rx;
 
 		/* setup "pc" pointer */
@@ -903,9 +903,9 @@ uss820dci_setup_standard_chain(struct us
 
 		uss820dci_setup_standard_chain_sub(&temp);
 
-		if ((xfer->status & XFER_STATUS_ISOCXFER) != 0) {
+		if ((xfer->status & XFER_STATUS_ISOCXFER) != 0)
 			temp.offset += temp.len;
-		} else {
+		else {
 			/* get next Page Cache pointer */
 			temp.pc = xfer->frbuffers + x;
 		}
@@ -973,27 +973,27 @@ uss820dci_intr_set(struct usb_xfer *xfer
 
 	DPRINTFN(15, "endpoint 0x%02x\n", xfer->endpointno);
 
-	if (ep_no > 3) {
+	if (ep_no > 3)
 		ep_reg = USS820_SBIE1;
-	} else
+	else
 		ep_reg = USS820_SBIE;
 
 	ep_no &= 3;
 	ep_no = 1 << (2 * ep_no);
 
 	if ((xfer->status & XFER_STATUS_CTRLXFER) != 0) {
-		if ((xfer->status & XFER_STATUS_CTRLHDR) != 0) {
+		if ((xfer->status & XFER_STATUS_CTRLHDR) != 0)
 			ep_no <<= 1;	/* RX interrupt only */
-		} else
+		else
 			ep_no |= (ep_no << 1);	/* RX and TX interrupt */
 	} else {
 		if (!(xfer->endpointno & UE_DIR_IN))
 			ep_no <<= 1;
 	}
 	temp = USS820_READ_1(sc, ep_reg);
-	if (set) {
+	if (set)
 		temp |= ep_no;
-	} else
+	else
 		temp &= ~ep_no;
 	USS820_WRITE_1(sc, ep_reg, temp);
 }
@@ -1058,9 +1058,9 @@ uss820dci_standard_done_sub(struct usb_x
 		         * Verify the length and subtract
 		         * the remainder from "frlengths[]":
 		         */
-			if (len > xfer->frlengths[xfer->aframes]) {
+			if (len > xfer->frlengths[xfer->aframes])
 				td->error = 1;
-			} else
+			else
 				xfer->frlengths[xfer->aframes] -= len;
 		}
 		/* Check for transfer error */
@@ -1074,9 +1074,9 @@ uss820dci_standard_done_sub(struct usb_x
 		if (len > 0) {
 			if ((xfer->status & XFER_STATUS_SHORTFRAME_OK) != 0) {
 				/* follow alt next */
-				if (td->alt_next) {
+				if (td->alt_next)
 					td = td->obj_next;
-				} else
+				else
 					td = NULL;
 			} else {
 				/* the transfer is finished */
@@ -1185,9 +1185,9 @@ uss820dci_set_stall(struct usb_device *u
 	}
 	USS820_WRITE_1(sc, USS820_EPINDEX, ep_no);
 
-	if (ep_dir == UE_DIR_IN) {
+	if (ep_dir == UE_DIR_IN)
 		temp = USS820_EPCON_TXSTL;
-	} else
+	else
 		temp = USS820_EPCON_RXSTL;
 	uss820dci_update_shared_1(sc, USS820_EPCON, 0xFF, temp);
 }
@@ -2083,9 +2083,9 @@ tr_handle_get_port_status:
 
 	if (index != 1)
 		goto tr_stalled;
-	if (sc->sc_flags.status_vbus) {
+	if (sc->sc_flags.status_vbus)
 		uss820dci_pull_up(sc);
-	} else
+	else
 		uss820dci_pull_down(sc);
 
 	/* Select FULL-speed and Device Side Mode */

Modified: user/weongyo/usb/sys/dev/usb/input/atp.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/input/atp.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/input/atp.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -1036,9 +1036,9 @@ atp_update_strokes(struct atp_softc *sc,
 	for (i = 0; i < sc->sc_n_strokes; i++) {
 		stroke = &sc->sc_strokes[i];
 		if (stroke->components[X].matched &&
-		    stroke->components[Y].matched) {
+		    stroke->components[Y].matched)
 			atp_advance_stroke_state(sc, stroke, &movement);
-		} else {
+		else {
 			/*
 			 * At least one component of this stroke
 			 * didn't match against current pspans;
@@ -1248,9 +1248,9 @@ atp_advance_stroke_state(struct atp_soft
 		return;
 
 	/* Convert touch strokes to slides upon detecting movement or age. */
-	if (stroke->cum_movement >= atp_slide_min_movement) {
+	if (stroke->cum_movement >= atp_slide_min_movement)
 		atp_convert_to_slide(sc, stroke);
-	} else {
+	else {
 		/* If a touch stroke is found to be older than the
 		 * touch-timeout threshold, it should be converted to
 		 * a slide; except if there is a co-incident sibling

Modified: user/weongyo/usb/sys/dev/usb/input/uep.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/input/uep.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/input/uep.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -246,9 +246,9 @@ uep_intr_callback(struct usb_xfer *xfer,
 				goto tr_setup;
 
 			/* full packet: process */
-			if (pkt_len <= len) {
+			if (pkt_len <= len)
 				uep_process_pkt(sc, p);
-			} else {
+			else {
 				/* incomplete packet: save in buffer */
 				memcpy(sc->buf, p, len);
 				sc->buf_len = len;

Modified: user/weongyo/usb/sys/dev/usb/input/uhid.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/input/uhid.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/input/uhid.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -354,9 +354,9 @@ uhid_start_read(struct usb_fifo *fifo)
 {
 	struct uhid_softc *sc = usb_fifo_softc(fifo);
 
-	if (sc->sc_flags & UHID_FLAG_IMMED) {
+	if (sc->sc_flags & UHID_FLAG_IMMED)
 		usbd_transfer_start(sc->sc_xfer[UHID_CTRL_DT_RD]);
-	} else
+	else
 		usbd_transfer_start(sc->sc_xfer[UHID_INTR_DT_RD]);
 }
 
@@ -495,9 +495,9 @@ uhid_ioctl(struct usb_fifo *fifo, u_long
 	switch (cmd) {
 	case USB_GET_REPORT_DESC:
 		ugd = addr;
-		if (sc->sc_repdesc_size > ugd->ugd_maxlen) {
+		if (sc->sc_repdesc_size > ugd->ugd_maxlen)
 			size = ugd->ugd_maxlen;
-		} else
+		else
 			size = sc->sc_repdesc_size;
 		ugd->ugd_actlen = size;
 		if (ugd->ugd_data == NULL)

Modified: user/weongyo/usb/sys/dev/usb/input/ukbd.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/input/ukbd.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/input/ukbd.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -379,9 +379,9 @@ ukbd_get_key(struct ukbd_softc *sc, uint
 	if (sc->sc_flags & UKBD_FLAG_POLLING)
 		ukbd_do_poll(sc, wait);
 
-	if (sc->sc_inputs == 0) {
+	if (sc->sc_inputs == 0)
 		c = -1;
-	} else {
+	else {
 		c = sc->sc_input[sc->sc_inputhead];
 		--(sc->sc_inputs);
 		++(sc->sc_inputhead);
@@ -513,9 +513,9 @@ ukbd_timeout(void *arg)
 	/* Make sure any leftover key events gets read out */
 	ukbd_event_keyinput(sc);
 
-	if (ukbd_any_key_pressed(sc) || (sc->sc_inputs != 0)) {
+	if (ukbd_any_key_pressed(sc) || (sc->sc_inputs != 0))
 		ukbd_start_timer(sc);
-	} else
+	else
 		sc->sc_flags &= ~UKBD_FLAG_TIMER_RUNNING;
 }
 

Modified: user/weongyo/usb/sys/dev/usb/input/ums.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/input/ums.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/input/ums.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -816,9 +816,9 @@ ums_ioctl(struct usb_fifo *fifo, u_long 
 	case MOUSE_SETMODE:
 		mode = *(mousemode_t *)addr;
 
-		if (mode.level == -1) {
-			/* don't change the current setting */
-		} else if ((mode.level < 0) || (mode.level > 1)) {
+		if (mode.level == -1)
+			;	/* don't change the current setting */
+		else if ((mode.level < 0) || (mode.level > 1)) {
 			error = EINVAL;
 			goto done;
 		} else

Modified: user/weongyo/usb/sys/dev/usb/misc/udbp.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/misc/udbp.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/misc/udbp.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -608,9 +608,9 @@ ng_udbp_newhook(node_p node, hook_p hook
 		return (EINVAL);
 	mtx_lock(&sc->sc_mtx);
 
-	if (sc->sc_hook != NULL) {
+	if (sc->sc_hook != NULL)
 		error = EISCONN;
-	} else {
+	else {
 		sc->sc_hook = hook;
 		NG_HOOK_SET_PRIVATE(hook, NULL);
 	}
@@ -815,9 +815,9 @@ ng_udbp_disconnect(hook_p hook)
 	if (sc != NULL) {
 		mtx_lock(&sc->sc_mtx);
 
-		if (hook != sc->sc_hook) {
+		if (hook != sc->sc_hook)
 			error = EINVAL;
-		} else {
+		else {
 			/* stop bulk-in transfer */
 			usbd_transfer_stop(sc->sc_xfer[UDBP_T_RD_CS]);
 			usbd_transfer_stop(sc->sc_xfer[UDBP_T_RD]);

Modified: user/weongyo/usb/sys/dev/usb/net/if_axe.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/net/if_axe.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/net/if_axe.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -1247,9 +1247,9 @@ axe_setpromisc(struct axe_softc *sc)
 
 	rxmode = le16toh(rxmode);
 
-	if (ifp->if_flags & IFF_PROMISC) {
+	if (ifp->if_flags & IFF_PROMISC)
 		rxmode |= AXE_RXCMD_PROMISC;
-	} else
+	else
 		rxmode &= ~AXE_RXCMD_PROMISC;
 
 	axe_cmd(sc, AXE_CMD_RXCTL_WRITE, 0, rxmode, NULL);

Modified: user/weongyo/usb/sys/dev/usb/net/if_cdce.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/net/if_cdce.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/net/if_cdce.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -526,9 +526,9 @@ alloc_transfers:
 	    (uaa->device, NULL, uaa->info.bIfaceIndex,
 	    UDESC_CS_INTERFACE, 0 - 1, UDESCSUB_CDC_ENF, 0 - 1);
 
-	if ((ued == NULL) || (ued->bLength < sizeof(*ued))) {
+	if ((ued == NULL) || (ued->bLength < sizeof(*ued)))
 		error = USB_ERR_INVAL;
-	} else {
+	else {
 		error = usbd_req_get_string_any(uaa->device, NULL, 
 		    eaddr_str, sizeof(eaddr_str), ued->iMacAddress);
 	}
@@ -1234,9 +1234,9 @@ cdce_ncm_bulk_read_callback(struct usb_x
 				m = NULL;
 				/* silently ignore this frame */
 				continue;
-			} else if (temp > (MHLEN - ETHER_ALIGN)) {
+			} else if (temp > (MHLEN - ETHER_ALIGN))
 				m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
-			} else
+			else
 				m = m_gethdr(M_DONTWAIT, MT_DATA);
 
 			DPRINTFN(16, "frame %u, offset = %u, length = %u \n",

Modified: user/weongyo/usb/sys/dev/usb/net/if_udav.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/net/if_udav.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/net/if_udav.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -630,9 +630,9 @@ tr_setup:
 			return;
 		if (m->m_pkthdr.len > MCLBYTES)
 			m->m_pkthdr.len = MCLBYTES;
-		if (m->m_pkthdr.len < UDAV_MIN_FRAME_LEN) {
+		if (m->m_pkthdr.len < UDAV_MIN_FRAME_LEN)
 			extra_len = UDAV_MIN_FRAME_LEN - m->m_pkthdr.len;
-		} else
+		else
 			extra_len = 0;
 
 		temp_len = (m->m_pkthdr.len + extra_len);

Modified: user/weongyo/usb/sys/dev/usb/serial/ucycom.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/ucycom.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/serial/ucycom.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -468,9 +468,9 @@ ucycom_cfg_param(struct ucom_softc *ucom
 
 	DPRINTF("\n");
 
-	if (t->c_cflag & CIGNORE) {
+	if (t->c_cflag & CIGNORE)
 		cfg = sc->sc_cfg;
-	} else {
+	else {
 		cfg = 0;
 		switch (t->c_cflag & CSIZE) {
 		default:

Modified: user/weongyo/usb/sys/dev/usb/serial/ufoma.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/ufoma.c	Sat Oct  2 05:43:17 2010	(r213346)
+++ user/weongyo/usb/sys/dev/usb/serial/ufoma.c	Sat Oct  2 06:43:39 2010	(r213347)
@@ -402,9 +402,9 @@ ufoma_attach(device_t dev)
 		goto detach;
 	}
 	if ((mad->bType == UMCPC_ACM_TYPE_AB5) ||
-	    (mad->bType == UMCPC_ACM_TYPE_AB6)) {
+	    (mad->bType == UMCPC_ACM_TYPE_AB6))
 		sc->sc_nobulk = 1;
-	} else {
+	else {
 		sc->sc_nobulk = 0;
 		if (ufoma_modem_setup(dev, sc, uaa))
 			goto detach;
@@ -580,9 +580,9 @@ tr_setup:
 		DPRINTF("error = %s\n",
 		    usbd_errstr(error));
 
-		if (error == USB_ERR_CANCELLED) {
+		if (error == USB_ERR_CANCELLED)
 			return;
-		} else
+		else
 			goto tr_setup;
 
 		goto tr_transferred;
@@ -624,9 +624,9 @@ tr_setup:
 	default:			/* Error */
 		DPRINTF("error = %s\n", usbd_errstr(error));
 
-		if (error == USB_ERR_CANCELLED) {
+		if (error == USB_ERR_CANCELLED)
 			return;
-		} else
+		else
 			goto tr_setup;
 
 		goto tr_transferred;
@@ -923,15 +923,15 @@ ufoma_cfg_param(struct ucom_softc *ucom,
 
 	USETDW(ls.dwDTERate, t->c_ospeed);
 
-	if (t->c_cflag & CSTOPB) {
+	if (t->c_cflag & CSTOPB)
 		ls.bCharFormat = UCDC_STOP_BIT_2;
-	} else
+	else
 		ls.bCharFormat = UCDC_STOP_BIT_1;
 
 	if (t->c_cflag & PARENB) {
-		if (t->c_cflag & PARODD) {
+		if (t->c_cflag & PARODD)
 			ls.bParityType = UCDC_PARITY_ODD;
-		} else
+		else
 			ls.bParityType = UCDC_PARITY_EVEN;
 	} else
 		ls.bParityType = UCDC_PARITY_NONE;
@@ -1037,9 +1037,9 @@ ufoma_start_read(struct ucom_softc *ucom
 	usbd_transfer_start(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_INTR]);
 
 	/* start data transfer */
-	if (sc->sc_nobulk) {
+	if (sc->sc_nobulk)
 		usbd_transfer_start(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_READ]);

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-user mailing list