AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] uml: Remove unneeded structure field

Browse Source 
This removes a structure field which turned out to be pointless, and
references to it.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jeff Dike 2006-01-06 00:18:52 -08:00 committed by Linus Torvalds
parent 0834cc77af
commit 88890b8874
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -315,7 +315,7 @@ int console_open_chan(struct line *line, struct console *co,
return 0; return 0;
if (0 != parse_chan_pair(line->init_str, &line->chan_list, if (0 != parse_chan_pair(line->init_str, &line->chan_list,
line->init_pri, co->index, opts)) co->index, opts))
return -1; return -1;
if (0 != open_chan(&line->chan_list)) if (0 != open_chan(&line->chan_list))
return -1; return -1;
@ -468,8 +468,7 @@ struct chan_type chan_table[] = {
#endif #endif
}; };
static struct chan *parse_chan(char *str, int pri, int device, static struct chan *parse_chan(char *str, int device, struct chan_opts *opts)
struct chan_opts *opts)
{ {
struct chan_type *entry; struct chan_type *entry;
struct chan_ops *ops; struct chan_ops *ops;
@ -507,13 +506,12 @@ static struct chan *parse_chan(char *str, int pri, int device,
.output = 0, .output = 0,
.opened = 0, .opened = 0,
.fd = -1, .fd = -1,
.pri = pri,
.ops = ops, .ops = ops,
.data = data }); .data = data });
return chan; return chan;
} }
int parse_chan_pair(char *str, struct list_head *chans, int pri, int device, int parse_chan_pair(char *str, struct list_head *chans, int device,
struct chan_opts *opts) struct chan_opts *opts)
{ {
struct chan *new, *chan; struct chan *new, *chan;
@ -521,8 +519,6 @@ int parse_chan_pair(char *str, struct list_head *chans, int pri, int device,
if(!list_empty(chans)){ if(!list_empty(chans)){
chan = list_entry(chans->next, struct chan, list); chan = list_entry(chans->next, struct chan, list);
if(chan->pri >= pri)
return 0;
free_chan(chans); free_chan(chans);
INIT_LIST_HEAD(chans); INIT_LIST_HEAD(chans);
} }
@ -532,14 +528,14 @@ int parse_chan_pair(char *str, struct list_head *chans, int pri, int device,
in = str; in = str;
*out = '\0'; *out = '\0';
out++; out++;
new = parse_chan(in, pri, device, opts); new = parse_chan(in, device, opts);
if(new == NULL) if(new == NULL)
return -1; return -1;
new->input = 1; new->input = 1;
list_add(&new->list, chans); list_add(&new->list, chans);
new = parse_chan(out, pri, device, opts); new = parse_chan(out, device, opts);
if(new == NULL) if(new == NULL)
return -1; return -1;
@ -547,7 +543,7 @@ int parse_chan_pair(char *str, struct list_head *chans, int pri, int device,
new->output = 1; new->output = 1;
} }
else { else {
new = parse_chan(str, pri, device, opts); new = parse_chan(str, device, opts);
if(new == NULL) if(new == NULL)
return -1; return -1;

2
arch/um/drivers/line.c
View File

@ -438,7 +438,7 @@ int line_open(struct line *lines, struct tty_struct *tty,
} }
if (list_empty(&line->chan_list)) { if (list_empty(&line->chan_list)) {
err = parse_chan_pair(line->init_str, &line->chan_list, err = parse_chan_pair(line->init_str, &line->chan_list,
line->init_pri, tty->index, opts); tty->index, opts);
if(err) goto out; if(err) goto out;
err = open_chan(&line->chan_list); err = open_chan(&line->chan_list);
if(err) goto out; if(err) goto out;

5
arch/um/include/chan_kern.h
View File

@ -20,15 +20,14 @@ struct chan {
unsigned int output:1; unsigned int output:1;
unsigned int opened:1; unsigned int opened:1;
int fd; int fd;
enum chan_init_pri pri;
struct chan_ops *ops; struct chan_ops *ops;
void *data; void *data;
}; };
extern void chan_interrupt(struct list_head *chans, struct work_struct *task, extern void chan_interrupt(struct list_head *chans, struct work_struct *task,
struct tty_struct *tty, int irq); struct tty_struct *tty, int irq);
extern int parse_chan_pair(char *str, struct list_head *chans, int pri, extern int parse_chan_pair(char *str, struct list_head *chans, int device,
int device, struct chan_opts *opts); struct chan_opts *opts);
extern int open_chan(struct list_head *chans); extern int open_chan(struct list_head *chans);
extern int write_chan(struct list_head *chans, const char *buf, int len, extern int write_chan(struct list_head *chans, const char *buf, int len,
int write_irq); int write_irq);