Browse Source

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>
Jens Taprogge 13 years ago
parent
commit
699a89f1e2
1 changed files with 4 additions and 10 deletions
  1. 4 10
      drivers/staging/ipack/devices/ipoctal.c

+ 4 - 10
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;