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>

diff --git a/drivers/staging/ipack/devices/ipoctal.c b/drivers/staging/ipack/devices/ipoctal.c
index e0be6604c1ec4eb7fa026aab1602b139d1c859fd..4cc91730f34eb5e4e5c6151317dbaf13901626ba 100644 (file)
--- 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;