lkml.org 
[lkml]   [2012]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 09/24] Staging: ipack/devices/ipoctal: remove superfluous function.
Date
From: Jens Taprogge <jens.taprogge@taprogge.org>

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>
---
drivers/staging/ipack/devices/ipoctal.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/ipack/devices/ipoctal.c b/drivers/staging/ipack/devices/ipoctal.c
index e0be660..4cc9173 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;
--
1.7.10.4


\
 
 \ /
  Last update: 2012-09-12 16:41    [W:0.141 / U:2.416 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site