Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 940b241d authored by Anton Ivanov's avatar Anton Ivanov Committed by Richard Weinberger
Browse files

um: Remove obsolete reenable_XX calls 



reenable_fd has been a NOP since the introduction of the EPOLL
based interrupt controller.
reenable_channel() is no longer needed as the flow control is
now handled via the write IRQs on the channel.

Signed-off-by: default avatarAnton Ivanov <anton.ivanov@cambridgegreys.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent b9794231

arch/um/drivers/chan_kern.c

+0 −10
Original line number Diff line number Diff line
@@ -211,12 +211,6 @@ void deactivate_chan(struct chan *chan, int irq) 
		deactivate_fd(chan->fd, irq);

}



void reactivate_chan(struct chan *chan, int irq)

{

	if (chan && chan->enabled)

		reactivate_fd(chan->fd, irq);

}



int write_chan(struct chan *chan, const char *buf, int len,

	       int write_irq)

{
@@ -228,8 +222,6 @@ int write_chan(struct chan *chan, const char *buf, int len, 
	n = chan->ops->write(chan->fd, buf, len, chan->data);

	if (chan->primary) {

		ret = n;

		if ((ret == -EAGAIN) || ((ret >= 0) && (ret < len)))

			reactivate_fd(chan->fd, write_irq);

	}

	return ret;

}
@@ -527,8 +519,6 @@ void chan_interrupt(struct line *line, int irq) 
			tty_insert_flip_char(port, c, TTY_NORMAL);

	} while (err > 0);



	if (err == 0)

		reactivate_fd(chan->fd, irq);

	if (err == -EIO) {

		if (chan->primary) {

			tty_port_tty_hangup(&line->port, false);

arch/um/drivers/line.c

+0 −10
Original line number Diff line number Diff line
@@ -235,14 +235,6 @@ void line_unthrottle(struct tty_struct *tty) 


	line->throttled = 0;

	chan_interrupt(line, line->driver->read_irq);



	/*

	 * Maybe there is enough stuff pending that calling the interrupt

	 * throttles us again.  In this case, line->throttled will be 1

	 * again and we shouldn't turn the interrupt back on.

	 */

	if (!line->throttled)

		reactivate_chan(line->chan_in, line->driver->read_irq);

}



static irqreturn_t line_write_interrupt(int irq, void *data)
@@ -667,8 +659,6 @@ static irqreturn_t winch_interrupt(int irq, void *data) 
		tty_kref_put(tty);

	}

 out:

	if (winch->fd != -1)

		reactivate_fd(winch->fd, WINCH_IRQ);

	return IRQ_HANDLED;

}

arch/um/drivers/mconsole_kern.c

+0 −2
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ static irqreturn_t mconsole_interrupt(int irq, void *dev_id) 
	}

	if (!list_empty(&mc_requests))

		schedule_work(&mconsole_work);

	reactivate_fd(fd, MCONSOLE_IRQ);

	return IRQ_HANDLED;

}
@@ -240,7 +239,6 @@ void mconsole_stop(struct mc_request *req) 
		(*req->cmd->handler)(req);

	}

	os_set_fd_block(req->originating_fd, 0);

	reactivate_fd(req->originating_fd, MCONSOLE_IRQ);

	mconsole_reply(req, "", 0, 0);

}

arch/um/drivers/net_kern.c

+0 −2
Original line number Diff line number Diff line
@@ -137,8 +137,6 @@ static irqreturn_t uml_net_interrupt(int irq, void *dev_id) 
		schedule_work(&lp->work);

		goto out;

	}

	reactivate_fd(lp->fd, UM_ETH_IRQ);



out:

	spin_unlock(&lp->lock);

	return IRQ_HANDLED;

arch/um/drivers/port_kern.c

+0 −1
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ static void port_work_proc(struct work_struct *unused) 
		if (!port->has_connection)

			continue;



		reactivate_fd(port->fd, ACCEPT_IRQ);

		while (port_accept(port))

			;

		port->has_connection = 0;