diff options
| author | Jens Taprogge <jens.taprogge@taprogge.org> | 2012-09-12 14:55:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-12 09:54:16 -0700 |
| commit | 699a89f1e291af0d47744200011d5c24d9e462a6 (patch) | |
| tree | 2d9612a09de53c11983ab30d64c6fda79284e115 | |
| parent | 87cfb955007ece1ba2a78a419c033942ee300972 (diff) | |
Staging: ipack/devices/ipoctal: remove superfluous function.
ipoctal_write_tty and ipoctal_write are merged.
Signed-off-by: Jens Taprogge <jens.taprogge@taprogge.org>
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/ipack/devices/ipoctal.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/staging/ipack/devices/ipoctal.c b/drivers/staging/ipack/devices/ipoctal.c index e0be6604c1ec..4cc91730f34e 100644 --- a/drivers/staging/ipack/devices/ipoctal.c +++ b/drivers/staging/ipack/devices/ipoctal.c @@ -493,9 +493,11 @@ static inline int ipoctal_copy_write_buffer(struct ipoctal_channel *channel, return i; } -static int ipoctal_write(struct ipoctal_channel *channel, - const unsigned char *buf, int count) +static int ipoctal_write_tty(struct tty_struct *tty, + const unsigned char *buf, int count) { + struct ipoctal_channel *channel = tty->driver_data; + channel->nb_bytes = 0; channel->count_wr = 0; @@ -519,14 +521,6 @@ static int ipoctal_write(struct ipoctal_channel *channel, return channel->count_wr; } -static int ipoctal_write_tty(struct tty_struct *tty, - const unsigned char *buf, int count) -{ - struct ipoctal_channel *channel = tty->driver_data; - - return ipoctal_write(channel, buf, count); -} - static int ipoctal_write_room(struct tty_struct *tty) { struct ipoctal_channel *channel = tty->driver_data; |