Hi!
Please apply this trivial cleanup...
Pavel
diff -ur -x .dep* -x .hdep* -x *.[oas] -x *~ -x #* -x *CVS* -x *.orig -x *.rej -x
*.old -x .menu* -x asm -x local.h -x System.map -x autoconf.h -x compile.h -x
version.h -x .version -x defkeymap.c -x uni_hash.tbl -x zImage -x vmlinux -x vmlinuz
-x TAGS -x bootsect -x *RCS* -x conmakehash -x map -x build -x build -x configure -x
*target* -x *.flags -x *.bak clean/drivers/usb/acm.c linux/drivers/usb/acm.c
--- clean/drivers/usb/acm.c Fri Oct 5 21:06:08 2001
+++ linux/drivers/usb/acm.c Thu Oct 25 13:25:40 2001
@@ -129,10 +129,10 @@
*/
struct acm_line {
- __u32 speed;
- __u8 stopbits;
- __u8 parity;
- __u8 databits;
+ u32 speed;
+ u8 stopbits;
+ u8 parity;
+ u8 databits;
} __attribute__ ((packed));
/*
@@ -216,7 +216,7 @@
dbg("input control lines: dcd%c dsr%c break%c ring%c framing%c
parity%c overrun%c",
acm->ctrlin & ACM_CTRL_DCD ? '+' : '-', acm->ctrlin &
ACM_CTRL_DSR ? '+' : '-',
acm->ctrlin & ACM_CTRL_BRK ? '+' : '-', acm->ctrlin &
ACM_CTRL_RI ? '+' : '-',
- acm->ctrlin & ACM_CTRL_FRAMING ? '+' : '-',
acm->ctrlin & ACM_CTRL_PARITY ? '+' : '-',
+ acm->ctrlin & ACM_CTRL_FRAMING ? '+' : '-',
+acm->ctrlin & ACM_CTRL_PARITY ? '+' : '-',
acm->ctrlin & ACM_CTRL_OVERRUN ? '+' : '-');
return;
@@ -456,7 +456,7 @@
return -ENOIOCTLCMD;
}
-static __u32 acm_tty_speed[] = {
+static u32 acm_tty_speed[] = {
0, 50, 75, 110, 134, 150, 200, 300, 600,
1200, 1800, 2400, 4800, 9600, 19200, 38400,
57600, 115200, 230400, 460800, 500000, 576000,
@@ -526,22 +526,22 @@
usb_interface_claimed(cfacm->interface + 1))
continue;
- ifcom = cfacm->interface[0].altsetting + 0;
- ifdata = cfacm->interface[1].altsetting + 0;
+ ifcom = cfacm->interface[0].altsetting;
+ ifdata = cfacm->interface[1].altsetting;
if (ifdata->bInterfaceClass != 10 || ifdata->bNumEndpoints < 2) {
- ifcom = cfacm->interface[1].altsetting + 0;
- ifdata = cfacm->interface[0].altsetting + 0;
- if (ifdata->bInterfaceClass != 10 || ifdata->bNumEndpoints < 2)
- continue;
+ ifcom = cfacm->interface[1].altsetting;
+ ifdata = cfacm->interface[0].altsetting;
}
+ if (ifdata->bInterfaceClass != 10 || ifdata->bNumEndpoints < 2)
+ continue;
if (ifcom->bInterfaceClass != 2 || ifcom->bInterfaceSubClass != 2 ||
ifcom->bInterfaceProtocol != 1 || ifcom->bNumEndpoints < 1)
continue;
- epctrl = ifcom->endpoint + 0;
- epread = ifdata->endpoint + 0;
+ epctrl = ifcom->endpoint;
+ epread = ifdata->endpoint;
epwrite = ifdata->endpoint + 1;
if ((epctrl->bEndpointAddress & 0x80) != 0x80 || (epctrl->bmAttributes
& 3) != 3 ||
@@ -718,8 +718,9 @@
return -1;
}
+#ifdef MODULE
info(DRIVER_VERSION ":" DRIVER_DESC);
-
+#endif
return 0;
}
--
"I do not steal MS software. It is not worth it."
-- Pavel Kankovsky
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
