svn commit: r273887 - in stable/9/sys/dev/usb: controller serial wlan

[Hans Petter Selasky]

Author: hselasky
Date: Fri Oct 31 07:59:07 2014
New Revision: 273887
URL: https://svnweb.freebsd.org/changeset/base/273887

Log:
  MFC r269569:
  Remove unused defines.
  Fix some device_printf's that were missing '\n' at the end or had
  spelling errors.
  
  PR:		145319

Modified:
  stable/9/sys/dev/usb/controller/ehci.c
  stable/9/sys/dev/usb/serial/u3g.c
  stable/9/sys/dev/usb/serial/uftdi.c
  stable/9/sys/dev/usb/wlan/if_upgt.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/controller/ehci.c
==============================================================================
--- stable/9/sys/dev/usb/controller/ehci.c	Fri Oct 31 07:55:42 2014	(r273886)
+++ stable/9/sys/dev/usb/controller/ehci.c	Fri Oct 31 07:59:07 2014	(r273887)
@@ -212,7 +212,7 @@ ehci_reset(ehci_softc_t *sc)
 			return (0);
 		}
 	}
-	device_printf(sc->sc_bus.bdev, "Reset timeout\n");
+	device_printf(sc->sc_bus.bdev, "reset timeout\n");
 	return (USB_ERR_IOERROR);
 }
 
@@ -287,7 +287,7 @@ ehci_init_sub(struct ehci_softc *sc)
 		}
 	}
 	if (hcr) {
-		device_printf(sc->sc_bus.bdev, "Run timeout\n");
+		device_printf(sc->sc_bus.bdev, "run timeout\n");
 		return (USB_ERR_IOERROR);
 	}
 	return (USB_ERR_NORMAL_COMPLETION);

Modified: stable/9/sys/dev/usb/serial/u3g.c
==============================================================================
--- stable/9/sys/dev/usb/serial/u3g.c	Fri Oct 31 07:55:42 2014	(r273886)
+++ stable/9/sys/dev/usb/serial/u3g.c	Fri Oct 31 07:59:07 2014	(r273887)
@@ -78,15 +78,6 @@ SYSCTL_INT(_hw_usb_u3g, OID_AUTO, debug,
 #define	U3G_TXSIZE		(U3G_BSIZE / U3G_TXFRAMES)
 #define	U3G_TXFRAMES		4
 
-#define	U3GSP_GPRS		0
-#define	U3GSP_EDGE		1
-#define	U3GSP_CDMA		2
-#define	U3GSP_UMTS		3
-#define	U3GSP_HSDPA		4
-#define	U3GSP_HSUPA		5
-#define	U3GSP_HSPA		6
-#define	U3GSP_MAX		7
-
 /* Eject methods; See also usb_quirks.h:UQ_MSC_EJECT_* */
 #define	U3GINIT_HUAWEI		1	/* Requires Huawei init command */
 #define	U3GINIT_SIERRA		2	/* Requires Sierra init command */
@@ -896,7 +887,7 @@ u3g_attach(device_t dev)
 		sc->sc_iface[nports] = id->bInterfaceNumber;
 
 		if (bootverbose && sc->sc_xfer[nports][U3G_INTR]) {
-			device_printf(dev, "port %d supports modem control",
+			device_printf(dev, "port %d supports modem control\n",
 				      nports);
 		}
 

Modified: stable/9/sys/dev/usb/serial/uftdi.c
==============================================================================
--- stable/9/sys/dev/usb/serial/uftdi.c	Fri Oct 31 07:55:42 2014	(r273886)
+++ stable/9/sys/dev/usb/serial/uftdi.c	Fri Oct 31 07:59:07 2014	(r273887)
@@ -979,7 +979,7 @@ uftdi_devtype_setup(struct uftdi_softc *
 		} else {
 			sc->sc_devtype = DEVT_232R;
 			device_printf(sc->sc_dev, "Warning: unknown FTDI "
-			    "device type, bcdDevice=0x%04x, assuming 232R", 
+			    "device type, bcdDevice=0x%04x, assuming 232R\n", 
 			    uaa->info.bcdDevice);
 		}
 		sc->sc_ucom.sc_portno = 0;

Modified: stable/9/sys/dev/usb/wlan/if_upgt.c
==============================================================================
--- stable/9/sys/dev/usb/wlan/if_upgt.c	Fri Oct 31 07:55:42 2014	(r273886)
+++ stable/9/sys/dev/usb/wlan/if_upgt.c	Fri Oct 31 07:59:07 2014	(r273887)
@@ -428,7 +428,7 @@ upgt_get_stats(struct upgt_softc *sc)
 
 	data_cmd = upgt_getbuf(sc);
 	if (data_cmd == NULL) {
-		device_printf(sc->sc_dev, "%s: out of buffer.\n", __func__);
+		device_printf(sc->sc_dev, "%s: out of buffers.\n", __func__);
 		return;
 	}