diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-11-15 15:10:36 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-11-15 15:10:36 -0800 |
| commit | 4327974639c4d7f8688f564081956f8f79ef053c (patch) | |
| tree | 0ca57c56b2f76a39f476e8f22b0112aa566b3a86 /drivers/tty/serial/jsm/jsm.h | |
| parent | c3e5127312f97482a6a09c0df602c726675eff5b (diff) | |
| parent | f6b252b6b92671d2633008408c06d35c26e55ecf (diff) | |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebase
Diffstat (limited to 'drivers/tty/serial/jsm/jsm.h')
| -rw-r--r-- | drivers/tty/serial/jsm/jsm.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/tty/serial/jsm/jsm.h b/drivers/tty/serial/jsm/jsm.h index b704c8ce0d7..5b837e749c1 100644 --- a/drivers/tty/serial/jsm/jsm.h +++ b/drivers/tty/serial/jsm/jsm.h @@ -183,10 +183,8 @@ struct jsm_board /* Our Read/Error/Write queue sizes */ #define RQUEUEMASK 0x1FFF /* 8 K - 1 */ #define EQUEUEMASK 0x1FFF /* 8 K - 1 */ -#define WQUEUEMASK 0x0FFF /* 4 K - 1 */ #define RQUEUESIZE (RQUEUEMASK + 1) #define EQUEUESIZE RQUEUESIZE -#define WQUEUESIZE (WQUEUEMASK + 1) /************************************************************************ @@ -226,10 +224,6 @@ struct jsm_channel { u16 ch_e_head; /* Head location of the error queue */ u16 ch_e_tail; /* Tail location of the error queue */ - u8 *ch_wqueue; /* Our write queue buffer - malloc'ed */ - u16 ch_w_head; /* Head location of the write queue */ - u16 ch_w_tail; /* Tail location of the write queue */ - u64 ch_rxcount; /* total of data received so far */ u64 ch_txcount; /* total of data transmitted so far */ @@ -378,7 +372,6 @@ extern int jsm_debug; * Prototypes for non-static functions used in more than one module * *************************************************************************/ -int jsm_tty_write(struct uart_port *port); int jsm_tty_init(struct jsm_board *); int jsm_uart_port_init(struct jsm_board *); int jsm_remove_uart_port(struct jsm_board *); |