git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
usb
/
serial
/
ezusb.c
diff --git
a/drivers/usb/serial/ezusb.c
b/drivers/usb/serial/ezusb.c
index
676d965
..
93c803b
100644
(file)
--- a/
drivers/usb/serial/ezusb.c
+++ b/
drivers/usb/serial/ezusb.c
@@
-16,13
+16,6
@@
#include <linux/tty.h>
#include <linux/module.h>
#include <linux/usb.h>
#include <linux/tty.h>
#include <linux/module.h>
#include <linux/usb.h>
-
-#ifdef CONFIG_USB_SERIAL_DEBUG
- static int debug = 1;
-#else
- static int debug;
-#endif
-
#include "usb-serial.h"
/* EZ-USB Control and Status Register. Bit 0 controls 8051 reset */
#include "usb-serial.h"
/* EZ-USB Control and Status Register. Bit 0 controls 8051 reset */
@@
-35,7
+28,7
@@
int ezusb_writememory (struct usb_serial *serial, int address, unsigned char *da
/* dbg("ezusb_writememory %x, %d", address, length); */
if (!serial->dev) {
/* dbg("ezusb_writememory %x, %d", address, length); */
if (!serial->dev) {
-
dbg
("%s - no physical device present, failing.", __FUNCTION__);
+
err
("%s - no physical device present, failing.", __FUNCTION__);
return -ENODEV;
}
return -ENODEV;
}
@@
-52,12
+45,12
@@
int ezusb_writememory (struct usb_serial *serial, int address, unsigned char *da
int ezusb_set_reset (struct usb_serial *serial, unsigned char reset_bit)
{
int ezusb_set_reset (struct usb_serial *serial, unsigned char reset_bit)
{
- int response;
- dbg("%s - %d", __FUNCTION__, reset_bit);
+ int response;
+
+ /* dbg("%s - %d", __FUNCTION__, reset_bit); */
response = ezusb_writememory (serial, CPUCS_REG, &reset_bit, 1, 0xa0);
response = ezusb_writememory (serial, CPUCS_REG, &reset_bit, 1, 0xa0);
- if (response < 0)
{
+ if (response < 0)
dev_err(&serial->dev->dev, "%s- %d failed\n", __FUNCTION__, reset_bit);
dev_err(&serial->dev->dev, "%s- %d failed\n", __FUNCTION__, reset_bit);
- }
return response;
}
return response;
}