xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

um: switch close_chan() to struct line

Browse Source 
... and switch chan_interrupt() to directly calling close_one_chan(),
so we can lose delay_free_irq argument of close_chan() as well.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Al Viro
2011-09-10 08:39:18 -04:00
committed by Richard Weinberger
parent 0fcd719934
commit 10c890c0a3
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/um/drivers/chan_kern.c
View File

@@ -185,7 +185,7 @@ int enable_chan(struct line *line)
return 0;
out_close:
close_chan(&line->chan_list, 0);
close_chan(line);
return err;
}
@@ -246,7 +246,7 @@ static void close_one_chan(struct chan *chan, int delay_free_irq)
chan->fd = -1;
}
void close_chan(struct list_head *chans, int delay_free_irq)
void close_chan(struct line *line)
{
struct chan *chan;
@@ -255,8 +255,8 @@ void close_chan(struct list_head *chans, int delay_free_irq)
* state. Then, the first one opened will have the original state,
* so it must be the last closed.
*/
list_for_each_entry_reverse(chan, chans, list) {
close_one_chan(chan, delay_free_irq);
list_for_each_entry_reverse(chan, &line->chan_list, list) {
close_one_chan(chan, 0);
}
}
@@ -587,10 +587,12 @@ void chan_interrupt(struct line *line, struct tty_struct *tty, int irq)
if (chan->primary) {
if (tty != NULL)
tty_hangup(tty);
close_chan(&line->chan_list, 1);
return;
if (line->chan_out != chan)
close_one_chan(line->chan_out, 1);
}
else close_one_chan(chan, 1);
close_one_chan(chan, 1);
if (chan->primary)
return;
}
out:
if (tty)