diff options
| -rw-r--r-- | drivers/staging/serqt_usb/serqt_usb.c | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/drivers/staging/serqt_usb/serqt_usb.c b/drivers/staging/serqt_usb/serqt_usb.c index 3b73c782e3c9..1781510c53fd 100644 --- a/drivers/staging/serqt_usb/serqt_usb.c +++ b/drivers/staging/serqt_usb/serqt_usb.c | |||
| @@ -288,8 +288,6 @@ static void serial_throttle(struct tty_struct *tty); | |||
| 288 | static void serial_unthrottle(struct tty_struct *tty); | 288 | static void serial_unthrottle(struct tty_struct *tty); |
| 289 | static int serial_break(struct tty_struct *tty, int break_state); | 289 | static int serial_break(struct tty_struct *tty, int break_state); |
| 290 | static int serial_chars_in_buffer(struct tty_struct *tty); | 290 | static int serial_chars_in_buffer(struct tty_struct *tty); |
| 291 | static int serial_read_proc(char *page, char **start, off_t off, int count, | ||
| 292 | int *eof, void *data); | ||
| 293 | 291 | ||
| 294 | static int qt_open(struct usb_serial_port *port, struct file *filp); | 292 | static int qt_open(struct usb_serial_port *port, struct file *filp); |
| 295 | static int BoxSetPrebufferLevel(struct usb_serial *serial); | 293 | static int BoxSetPrebufferLevel(struct usb_serial *serial); |
| @@ -438,7 +436,6 @@ static const struct tty_operations serial_ops = { | |||
| 438 | .unthrottle = serial_unthrottle, | 436 | .unthrottle = serial_unthrottle, |
| 439 | .break_ctl = serial_break, | 437 | .break_ctl = serial_break, |
| 440 | .chars_in_buffer = serial_chars_in_buffer, | 438 | .chars_in_buffer = serial_chars_in_buffer, |
| 441 | .read_proc = serial_read_proc, | ||
| 442 | .tiocmset = serial_tiocmset, | 439 | .tiocmset = serial_tiocmset, |
| 443 | .tiocmget = serial_tiocmget, | 440 | .tiocmget = serial_tiocmget, |
| 444 | }; | 441 | }; |
| @@ -2417,52 +2414,6 @@ exit: | |||
| 2417 | return 0; | 2414 | return 0; |
| 2418 | } | 2415 | } |
| 2419 | 2416 | ||
| 2420 | static int serial_read_proc(char *page, char **start, off_t off, int count, | ||
| 2421 | int *eof, void *data) | ||
| 2422 | { | ||
| 2423 | struct usb_serial *serial; | ||
| 2424 | int length = 0; | ||
| 2425 | int i; | ||
| 2426 | off_t begin = 0; | ||
| 2427 | |||
| 2428 | mydbg("%s\n", __func__); | ||
| 2429 | length += sprintf(page, "usbserinfo:1.0 driver:%s\n", DRIVER_VERSION); | ||
| 2430 | for (i = 0; i < SERIAL_TTY_MINORS && length < PAGE_SIZE; ++i) { | ||
| 2431 | serial = get_serial_by_minor(i); | ||
| 2432 | if (serial == NULL) | ||
| 2433 | continue; | ||
| 2434 | |||
| 2435 | length += sprintf(page + length, "%d:\n", i); | ||
| 2436 | length += | ||
| 2437 | sprintf(page + length, " vendor:%04x product:%04x\n", | ||
| 2438 | serial->vendor, serial->product); | ||
| 2439 | length += | ||
| 2440 | sprintf(page + length, " num_ports:%d\n", | ||
| 2441 | serial->num_ports); | ||
| 2442 | length += | ||
| 2443 | sprintf(page + length, " port:%d\n", i - serial->minor + 1); | ||
| 2444 | |||
| 2445 | /* | ||
| 2446 | usb_make_path(serial->dev, tmp, sizeof(tmp)); | ||
| 2447 | length += sprintf (page+length, " path:%s", tmp); | ||
| 2448 | */ | ||
| 2449 | |||
| 2450 | length += sprintf(page + length, "\n"); | ||
| 2451 | if ((length + begin) > (off + count)) | ||
| 2452 | goto done; | ||
| 2453 | if ((length + begin) < off) { | ||
| 2454 | begin += length; | ||
| 2455 | length = 0; | ||
| 2456 | } | ||
| 2457 | } | ||
| 2458 | *eof = 1; | ||
| 2459 | done: | ||
| 2460 | if (off >= (length + begin)) | ||
| 2461 | return 0; | ||
| 2462 | *start = page + (off - begin); | ||
| 2463 | return ((count < begin + length - off) ? count : begin + length - off); | ||
| 2464 | } | ||
| 2465 | |||
| 2466 | static int ioctl_serial_usb(struct inode *innod, struct file *filp, unsigned int cmd, | 2417 | static int ioctl_serial_usb(struct inode *innod, struct file *filp, unsigned int cmd, |
| 2467 | unsigned long arg) | 2418 | unsigned long arg) |
| 2468 | { | 2419 | { |
