1 files changed, 22 insertions, 69 deletions

diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index 1c1a1db..1088860 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -361,9 +361,7 @@ USB_ATTACH(umodem)
 }
 
 void
-umodem_get_caps(dev, cm, acm)
-	usbd_device_handle dev;
-	int *cm, *acm;
+umodem_get_caps(usbd_device_handle dev, int *cm, int *acm)
 {
 	usb_cdc_cm_descriptor_t *cmd;
 	usb_cdc_acm_descriptor_t *cad;
@@ -386,8 +384,7 @@ umodem_get_caps(dev, cm, acm)
 } 
 
 void
-umodemstart(tp)
-	struct tty *tp;
+umodemstart(struct tty *tp)
 {
 	struct umodem_softc *sc;
 	struct cblock *cbp;
@@ -465,10 +462,8 @@ out:
 }
 
 void
-umodemwritecb(xfer, priv, status)
-	usbd_xfer_handle xfer;
-	usbd_private_handle priv;
-	usbd_status status;
+umodemwritecb(usbd_xfer_handle xfer, usbd_private_handle priv,
+	      usbd_status status)
 {
 	struct umodem_softc *sc = (struct umodem_softc *)priv;
 	struct tty *tp = sc->sc_tty;
@@ -502,9 +497,7 @@ umodemwritecb(xfer, priv, status)
 }
 
 int
-umodemparam(tp, t)
-	struct tty *tp;
-	struct termios *t;
+umodemparam(struct tty *tp, struct termios *t)
 {
 	struct umodem_softc *sc;
 	usb_cdc_line_state_t ls;
@@ -574,10 +567,7 @@ umodemparam(tp, t)
 }
 
 int
-umodemopen(dev, flag, mode, p)
-	dev_t dev;
-	int flag, mode;
-	usb_proc_ptr p;
+umodemopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
 {
 	int unit = UMODEMUNIT(dev);
 	struct umodem_softc *sc;
@@ -720,8 +710,7 @@ bad:
 }
 
 usbd_status
-umodemstartread(sc)
-	struct umodem_softc *sc;
+umodemstartread(struct umodem_softc *sc)
 {
 	usbd_status err;
 
@@ -739,10 +728,7 @@ umodemstartread(sc)
 }
  
 void
-umodemreadcb(xfer, p, status)
-	usbd_xfer_handle xfer;
-	usbd_private_handle p;
-	usbd_status status;
+umodemreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
 {
 	struct umodem_softc *sc = (struct umodem_softc *)p;
 	struct tty *tp = sc->sc_tty;
@@ -784,10 +770,7 @@ umodemreadcb(xfer, p, status)
 }
 
 int
-umodemclose(dev, flag, mode, p)
-	dev_t dev;
-	int flag, mode;
-	usb_proc_ptr p;
+umodemclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
 {
 	struct umodem_softc *sc;
 	struct tty *tp;
@@ -836,8 +819,7 @@ umodemclose(dev, flag, mode, p)
 }
  
 void
-umodem_cleanup(sc)
-	struct umodem_softc *sc;
+umodem_cleanup(struct umodem_softc *sc)
 {
 	umodem_shutdown(sc);
 
@@ -854,10 +836,7 @@ umodem_cleanup(sc)
 }
 
 int
-umodemread(dev, uio, flag)
-	dev_t dev;
-	struct uio *uio;
-	int flag;
+umodemread(dev_t dev, uio *uio, int flag)
 {
 	struct umodem_softc *sc;
 	struct tty *tp;
@@ -873,10 +852,7 @@ umodemread(dev, uio, flag)
 }
  
 int
-umodemwrite(dev, uio, flag)
-	dev_t dev;
-	struct uio *uio;
-	int flag;
+umodemwrite(dev_t dev, struct uio *uio, int flag)
 {
 	struct umodem_softc *sc;
 	struct tty *tp;
@@ -892,9 +868,7 @@ umodemwrite(dev, uio, flag)
 }
 
 void
-umodemstop(tp, flag)
-	struct tty *tp;
-	int flag;
+umodemstop(struct tty *tp, int flag)
 {
 	struct umodem_softc *sc;
 	int s;
@@ -913,8 +887,7 @@ umodemstop(tp, flag)
 }
 
 struct tty *
-umodemtty(dev)
-	dev_t dev;
+umodemtty(dev_t dev)
 {
 	struct umodem_softc *sc;
 	struct tty *tp;
@@ -927,12 +900,7 @@ umodemtty(dev)
 }
 
 int
-umodemioctl(dev, cmd, data, flag, p)
-	dev_t dev;
-	u_long cmd;
-	caddr_t data;
-	int flag;
-	usb_proc_ptr p;
+umodemioctl(dev_t dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 {
 	struct umodem_softc *sc;
 	struct tty *tp;
@@ -1013,8 +981,7 @@ umodemioctl(dev, cmd, data, flag, p)
 }
 
 void
-umodem_shutdown(sc)
-	struct umodem_softc *sc;
+umodem_shutdown(struct umodem_softc *sc)
 {
 	struct tty *tp = sc->sc_tty;
 
@@ -1034,9 +1001,7 @@ umodem_shutdown(sc)
 }
 
 void
-umodem_modem(sc, onoff)
-	struct umodem_softc *sc;
-	int onoff;
+umodem_modem(struct umodem_softc *sc, int onoff)
 {
 	usb_device_request_t req;
 
@@ -1057,9 +1022,7 @@ umodem_modem(sc, onoff)
 }
 
 void
-umodem_break(sc, onoff)
-	struct umodem_softc *sc;
-	int onoff;
+umodem_break(struct umodem_softc *sc, int onoff)
 {
 	usb_device_request_t req;
 
@@ -1078,10 +1041,7 @@ umodem_break(sc, onoff)
 }
 
 void *
-umodem_get_desc(dev, type, subtype)
-	usbd_device_handle dev;
-	int type;
-	int subtype;
+umodem_get_desc(usbd_device_handle dev, int type, int subtype)
 {
 	usb_descriptor_t *desc;
 	usb_config_descriptor_t *cd = usbd_get_config_descriptor(dev);
@@ -1100,10 +1060,7 @@ umodem_get_desc(dev, type, subtype)
 }
 
 usbd_status
-umodem_set_comm_feature(sc, feature, state)
-	struct umodem_softc *sc;
-	int feature;
-	int state;
+umodem_set_comm_feature(struct umodem_softc *sc, int feature, int state)
 {
 	usb_device_request_t req;
 	usbd_status err;
@@ -1127,9 +1084,7 @@ umodem_set_comm_feature(sc, feature, state)
 }
 
 usbd_status
-umodem_set_line_coding(sc, state)
-	struct umodem_softc *sc;
-	usb_cdc_line_state_t *state;
+umodem_set_line_coding(struct umodem_softc *sc, usb_cdc_line_state_t state)
 {
 	usb_device_request_t req;
 	usbd_status err;
@@ -1164,9 +1119,7 @@ umodem_set_line_coding(sc, state)
 
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 int
-umodem_activate(self, act)
-	device_ptr_t self;
-	enum devact act;
+umodem_activate(device_ptr_t self, enum devact act)
 {
 	struct umodem_softc *sc = (struct umodem_softc *)self;