projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[powerpc.git]
/
arch
/
um
/
drivers
/
line.c
diff --git
a/arch/um/drivers/line.c
b/arch/um/drivers/line.c
index
426633e
..
83301e1
100644
(file)
--- a/
arch/um/drivers/line.c
+++ b/
arch/um/drivers/line.c
@@
-31,9
+31,9
@@
static irqreturn_t line_interrupt(int irq, void *data)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static void line_timer_cb(
void *arg
)
+static void line_timer_cb(
struct work_struct *work
)
{
{
- struct line *line =
arg
;
+ struct line *line =
container_of(work, struct line, task.work)
;
if(!line->throttled)
chan_interrupt(&line->chan_list, &line->task, line->tty,
if(!line->throttled)
chan_interrupt(&line->chan_list, &line->task, line->tty,
@@
-246,7
+246,7
@@
out_up:
return ret;
}
return ret;
}
-void line_set_termios(struct tty_struct *tty, struct termios * old)
+void line_set_termios(struct tty_struct *tty, struct
k
termios * old)
{
/* nothing */
}
{
/* nothing */
}
@@
-443,7
+443,7
@@
int line_open(struct line *lines, struct tty_struct *tty)
* is registered.
*/
enable_chan(line);
* is registered.
*/
enable_chan(line);
- INIT_
WORK(&line->task, line_timer_cb, line
);
+ INIT_
DELAYED_WORK(&line->task, line_timer_cb
);
if(!line->sigio){
chan_enable_winch(&line->chan_list, tty);
if(!line->sigio){
chan_enable_winch(&line->chan_list, tty);