evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staging: ipack/devices/ipoctal: simplify ipoctal_write_tty()

Browse source 
Remove count_wr and the assigment of nb_bytes = 0 in that function as is
useless. Now it returns the count of the characters actually sent.

There is other nb_bytes = 0 deleted that has a duplicate a few lines before.

Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Samuel Iglesias Gonsalvez 2012-09-13 12:32:23 +02:00 • committed by Greg Kroah-Hartman
parent 4514108c5b
commit d04600679b
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/staging/ipack/devices/ipoctal.c
View file

@ -33,7 +33,6 @@ static const struct tty_operations ipoctal_fops;
struct ipoctal_channel { struct ipoctal_channel {
struct ipoctal_stats stats; struct ipoctal_stats stats;
unsigned int nb_bytes; unsigned int nb_bytes;
unsigned int count_wr;
wait_queue_head_t queue; wait_queue_head_t queue;
spinlock_t lock; spinlock_t lock;
unsigned int pointer_read; unsigned int pointer_read;
@ -189,7 +188,6 @@ static void ipoctal_irq_tx(struct ipoctal_channel *channel)
value = channel->tty_port.xmit_buf[*pointer_write]; value = channel->tty_port.xmit_buf[*pointer_write];
iowrite8(value, &channel->regs->w.thr); iowrite8(value, &channel->regs->w.thr);
channel->stats.tx++; channel->stats.tx++;
channel->count_wr++;
(*pointer_write)++; (*pointer_write)++;
*pointer_write = *pointer_write % PAGE_SIZE; *pointer_write = *pointer_write % PAGE_SIZE;
channel->nb_bytes--; channel->nb_bytes--;
@ -445,7 +443,6 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr,
spin_lock_init(&channel->lock); spin_lock_init(&channel->lock);
channel->pointer_read = 0; channel->pointer_read = 0;
channel->pointer_write = 0; channel->pointer_write = 0;
channel->nb_bytes = 0;
tty_dev = tty_register_device(tty, i, NULL); tty_dev = tty_register_device(tty, i, NULL);
if (IS_ERR(tty_dev)) { if (IS_ERR(tty_dev)) {
dev_err(&ipoctal->dev->dev, "Failed to register tty device.\n"); dev_err(&ipoctal->dev->dev, "Failed to register tty device.\n");
@ -500,11 +497,9 @@ static int ipoctal_write_tty(struct tty_struct *tty,
const unsigned char *buf, int count) const unsigned char *buf, int count)
{ {
struct ipoctal_channel *channel = tty->driver_data; struct ipoctal_channel *channel = tty->driver_data;
unsigned int char_copied;
channel->nb_bytes = 0; char_copied = ipoctal_copy_write_buffer(channel, buf, count);
channel->count_wr = 0;
ipoctal_copy_write_buffer(channel, buf, count);
/* As the IP-OCTAL 485 only supports half duplex, do it manually */ /* As the IP-OCTAL 485 only supports half duplex, do it manually */
if (channel->board_id == IPACK1_DEVICE_ID_SBS_OCTAL_485) { if (channel->board_id == IPACK1_DEVICE_ID_SBS_OCTAL_485) {
@ -521,7 +516,7 @@ static int ipoctal_write_tty(struct tty_struct *tty,
iowrite8(CR_DISABLE_TX, &channel->regs->w.cr); iowrite8(CR_DISABLE_TX, &channel->regs->w.cr);
*channel->board_write = 0; *channel->board_write = 0;
return channel->count_wr; return char_copied;
} }
static int ipoctal_write_room(struct tty_struct *tty) static int ipoctal_write_room(struct tty_struct *tty)