Commit d50084a2 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: Formatting changes



This patch makes a bunch of non-functional changes -
    return(foo); becomes return foo;
    some statements are broken across lines for readability
    some trailing whitespace is cleaned up
    open_one_chan took four arguments, three of which could be
       deduced from the first.  Accordingly, they were eliminated.
    some examples of "} else {" had a newline added
    some whitespace cleanup in the indentation
    lines_init got some control flow cleanup
    some long lines were broken
    removed another emacs-specific C formatting comment
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1b57e9c2
......@@ -58,7 +58,7 @@ static void *not_configged_init(char *str, int device, struct chan_opts *opts)
{
my_puts("Using a channel type which is configured out of "
"UML\n");
return(NULL);
return NULL;
}
static int not_configged_open(int input, int output, int primary, void *data,
......@@ -66,7 +66,7 @@ static int not_configged_open(int input, int output, int primary, void *data,
{
my_puts("Using a channel type which is configured out of "
"UML\n");
return(-ENODEV);
return -ENODEV;
}
static void not_configged_close(int fd, void *data)
......@@ -79,21 +79,21 @@ static int not_configged_read(int fd, char *c_out, void *data)
{
my_puts("Using a channel type which is configured out of "
"UML\n");
return(-EIO);
return -EIO;
}
static int not_configged_write(int fd, const char *buf, int len, void *data)
{
my_puts("Using a channel type which is configured out of "
"UML\n");
return(-EIO);
return -EIO;
}
static int not_configged_console_write(int fd, const char *buf, int len)
{
my_puts("Using a channel type which is configured out of "
"UML\n");
return(-EIO);
return -EIO;
}
static int not_configged_window_size(int fd, void *data, unsigned short *rows,
......@@ -101,7 +101,7 @@ static int not_configged_window_size(int fd, void *data, unsigned short *rows,
{
my_puts("Using a channel type which is configured out of "
"UML\n");
return(-ENODEV);
return -ENODEV;
}
static void not_configged_free(void *data)
......@@ -135,17 +135,17 @@ int generic_read(int fd, char *c_out, void *unused)
n = os_read_file(fd, c_out, sizeof(*c_out));
if(n == -EAGAIN)
return(0);
return 0;
else if(n == 0)
return(-EIO);
return(n);
return -EIO;
return n;
}
/* XXX Trivial wrapper around os_write_file */
int generic_write(int fd, const char *buf, int n, void *unused)
{
return(os_write_file(fd, buf, n));
return os_write_file(fd, buf, n);
}
int generic_window_size(int fd, void *unused, unsigned short *rows_out,
......@@ -156,14 +156,14 @@ int generic_window_size(int fd, void *unused, unsigned short *rows_out,
ret = os_window_size(fd, &rows, &cols);
if(ret < 0)
return(ret);
return ret;
ret = ((*rows_out != rows) || (*cols_out != cols));
*rows_out = rows;
*cols_out = cols;
return(ret);
return ret;
}
void generic_free(void *data)
......@@ -186,25 +186,29 @@ static void tty_receive_char(struct tty_struct *tty, char ch)
}
}
if((tty->flip.flag_buf_ptr == NULL) ||
if((tty->flip.flag_buf_ptr == NULL) ||
(tty->flip.char_buf_ptr == NULL))
return;
tty_insert_flip_char(tty, ch, TTY_NORMAL);
}
static int open_one_chan(struct chan *chan, int input, int output, int primary)
static int open_one_chan(struct chan *chan)
{
int fd;
if(chan->opened) return(0);
if(chan->ops->open == NULL) fd = 0;
else fd = (*chan->ops->open)(input, output, primary, chan->data,
&chan->dev);
if(fd < 0) return(fd);
if(chan->opened)
return 0;
if(chan->ops->open == NULL)
fd = 0;
else fd = (*chan->ops->open)(chan->input, chan->output, chan->primary,
chan->data, &chan->dev);
if(fd < 0)
return fd;
chan->fd = fd;
chan->opened = 1;
return(0);
return 0;
}
int open_chan(struct list_head *chans)
......@@ -215,11 +219,11 @@ int open_chan(struct list_head *chans)
list_for_each(ele, chans){
chan = list_entry(ele, struct chan, list);
ret = open_one_chan(chan, chan->input, chan->output,
chan->primary);
if(chan->primary) err = ret;
ret = open_one_chan(chan);
if(chan->primary)
err = ret;
}
return(err);
return err;
}
void chan_enable_winch(struct list_head *chans, struct tty_struct *tty)
......@@ -267,7 +271,7 @@ void close_chan(struct list_head *chans)
}
}
int write_chan(struct list_head *chans, const char *buf, int len,
int write_chan(struct list_head *chans, const char *buf, int len,
int write_irq)
{
struct list_head *ele;
......@@ -285,7 +289,7 @@ int write_chan(struct list_head *chans, const char *buf, int len,
reactivate_fd(chan->fd, write_irq);
}
}
return(ret);
return ret;
}
int console_write_chan(struct list_head *chans, const char *buf, int len)
......@@ -301,10 +305,11 @@ int console_write_chan(struct list_head *chans, const char *buf, int len)
n = chan->ops->console_write(chan->fd, buf, len);
if(chan->primary) ret = n;
}
return(ret);
return ret;
}
int console_open_chan(struct line *line, struct console *co, struct chan_opts *opts)
int console_open_chan(struct line *line, struct console *co,
struct chan_opts *opts)
{
if (!list_empty(&line->chan_list))
return 0;
......@@ -327,12 +332,13 @@ int chan_window_size(struct list_head *chans, unsigned short *rows_out,
list_for_each(ele, chans){
chan = list_entry(ele, struct chan, list);
if(chan->primary){
if(chan->ops->window_size == NULL) return(0);
return(chan->ops->window_size(chan->fd, chan->data,
rows_out, cols_out));
if(chan->ops->window_size == NULL)
return 0;
return chan->ops->window_size(chan->fd, chan->data,
rows_out, cols_out);
}
}
return(0);
return 0;
}
void free_one_chan(struct chan *chan)
......@@ -363,23 +369,23 @@ static int one_chan_config_string(struct chan *chan, char *str, int size,
if(chan == NULL){
CONFIG_CHUNK(str, size, n, "none", 1);
return(n);
return n;
}
CONFIG_CHUNK(str, size, n, chan->ops->type, 0);
if(chan->dev == NULL){
CONFIG_CHUNK(str, size, n, "", 1);
return(n);
return n;
}
CONFIG_CHUNK(str, size, n, ":", 0);
CONFIG_CHUNK(str, size, n, chan->dev, 0);
return(n);
return n;
}
static int chan_pair_config_string(struct chan *in, struct chan *out,
static int chan_pair_config_string(struct chan *in, struct chan *out,
char *str, int size, char **error_out)
{
int n;
......@@ -390,7 +396,7 @@ static int chan_pair_config_string(struct chan *in, struct chan *out,
if(in == out){
CONFIG_CHUNK(str, size, n, "", 1);
return(n);
return n;
}
CONFIG_CHUNK(str, size, n, ",", 1);
......@@ -399,10 +405,10 @@ static int chan_pair_config_string(struct chan *in, struct chan *out,
size -= n;
CONFIG_CHUNK(str, size, n, "", 1);
return(n);
return n;
}
int chan_config_string(struct list_head *chans, char *str, int size,
int chan_config_string(struct list_head *chans, char *str, int size,
char **error_out)
{
struct list_head *ele;
......@@ -418,7 +424,7 @@ int chan_config_string(struct list_head *chans, char *str, int size,
out = chan;
}
return(chan_pair_config_string(in, out, str, size, error_out));
return chan_pair_config_string(in, out, str, size, error_out);
}
struct chan_type {
......@@ -462,7 +468,7 @@ struct chan_type chan_table[] = {
#endif
};
static struct chan *parse_chan(char *str, int pri, int device,
static struct chan *parse_chan(char *str, int pri, int device,
struct chan_opts *opts)
{
struct chan_type *entry;
......@@ -484,14 +490,17 @@ static struct chan *parse_chan(char *str, int pri, int device,
if(ops == NULL){
my_printf("parse_chan couldn't parse \"%s\"\n",
str);
return(NULL);
return NULL;
}
if(ops->init == NULL) return(NULL);
if(ops->init == NULL)
return NULL;
data = (*ops->init)(str, device, opts);
if(data == NULL) return(NULL);
if(data == NULL)
return NULL;
chan = kmalloc(sizeof(*chan), GFP_ATOMIC);
if(chan == NULL) return(NULL);
if(chan == NULL)
return NULL;
*chan = ((struct chan) { .list = LIST_HEAD_INIT(chan->list),
.primary = 1,
.input = 0,
......@@ -501,7 +510,7 @@ static struct chan *parse_chan(char *str, int pri, int device,
.pri = pri,
.ops = ops,
.data = data });
return(chan);
return chan;
}
int parse_chan_pair(char *str, struct list_head *chans, int pri, int device,
......@@ -512,7 +521,8 @@ int parse_chan_pair(char *str, struct list_head *chans, int pri, int device,
if(!list_empty(chans)){
chan = list_entry(chans->next, struct chan, list);
if(chan->pri >= pri) return(0);
if(chan->pri >= pri)
return 0;
free_chan(chans);
INIT_LIST_HEAD(chans);
}
......@@ -523,23 +533,29 @@ int parse_chan_pair(char *str, struct list_head *chans, int pri, int device,
*out = '\0';
out++;
new = parse_chan(in, pri, device, opts);
if(new == NULL) return(-1);
if(new == NULL)
return -1;
new->input = 1;
list_add(&new->list, chans);
new = parse_chan(out, pri, device, opts);
if(new == NULL) return(-1);
if(new == NULL)
return -1;
list_add(&new->list, chans);
new->output = 1;
}
else {
new = parse_chan(str, pri, device, opts);
if(new == NULL) return(-1);
if(new == NULL)
return -1;
list_add(&new->list, chans);
new->input = 1;
new->output = 1;
}
return(0);
return 0;
}
int chan_out_fd(struct list_head *chans)
......@@ -550,9 +566,9 @@ int chan_out_fd(struct list_head *chans)
list_for_each(ele, chans){
chan = list_entry(ele, struct chan, list);
if(chan->primary && chan->output)
return(chan->fd);
return chan->fd;
}
return(-1);
return -1;
}
void chan_interrupt(struct list_head *chans, struct work_struct *task,
......@@ -567,7 +583,7 @@ void chan_interrupt(struct list_head *chans, struct work_struct *task,
chan = list_entry(ele, struct chan, list);
if(!chan->input || (chan->ops->read == NULL)) continue;
do {
if((tty != NULL) &&
if((tty != NULL) &&
(tty->flip.count >= TTY_FLIPBUF_SIZE)){
schedule_work(task);
goto out;
......
......@@ -124,7 +124,8 @@ static int buffer_data(struct line *line, const char *buf, int len)
if (len < end){
memcpy(line->tail, buf, len);
line->tail += len;
} else {
}
else {
/* The circular buffer is wrapping */
memcpy(line->tail, buf, end);
buf += end;
......@@ -170,7 +171,7 @@ static int flush_buffer(struct line *line)
}
count = line->tail - line->head;
n = write_chan(&line->chan_list, line->head, count,
n = write_chan(&line->chan_list, line->head, count,
line->driver->write_irq);
if(n < 0)
......@@ -227,7 +228,7 @@ int line_write(struct tty_struct *tty, const unsigned char *buf, int len)
if (err <= 0 && (err != -EAGAIN || !ret))
ret = err;
} else {
n = write_chan(&line->chan_list, buf, len,
n = write_chan(&line->chan_list, buf, len,
line->driver->write_irq);
if (n < 0) {
ret = n;
......@@ -384,13 +385,13 @@ int line_setup_irq(int fd, int input, int output, struct tty_struct *tty)
if (input)
err = um_request_irq(driver->read_irq, fd, IRQ_READ,
line_interrupt, flags,
line_interrupt, flags,
driver->read_irq_name, tty);
if (err)
return err;
if (output)
err = um_request_irq(driver->write_irq, fd, IRQ_WRITE,
line_write_interrupt, flags,
line_write_interrupt, flags,
driver->write_irq_name, tty);
line->have_irq = 1;
return err;
......@@ -512,10 +513,11 @@ int line_setup(struct line *lines, unsigned int num, char *init, int all_allowed
/* We said con=/ssl= instead of con#=, so we are configuring all
* consoles at once.*/
n = -1;
} else {
}
else {
n = simple_strtoul(init, &end, 0);
if(*end != '='){
printk(KERN_ERR "line_setup failed to parse \"%s\"\n",
printk(KERN_ERR "line_setup failed to parse \"%s\"\n",
init);
return 0;
}
......@@ -527,7 +529,8 @@ int line_setup(struct line *lines, unsigned int num, char *init, int all_allowed
printk("line_setup - %d out of range ((0 ... %d) allowed)\n",
n, num - 1);
return 0;
} else if (n >= 0){
}
else if (n >= 0){
if (lines[n].count > 0) {
printk("line_setup - device %d is open\n", n);
return 0;
......@@ -541,11 +544,13 @@ int line_setup(struct line *lines, unsigned int num, char *init, int all_allowed
lines[n].valid = 1;
}
}
} else if(!all_allowed){
}
else if(!all_allowed){
printk("line_setup - can't configure all devices from "
"mconsole\n");
return 0;
} else {
}
else {
for(i = 0; i < num; i++){
if(lines[i].init_pri <= INIT_ALL){
lines[i].init_pri = INIT_ALL;
......@@ -627,7 +632,7 @@ int line_remove(struct line *lines, unsigned int num, int n)
}
struct tty_driver *line_register_devfs(struct lines *set,
struct line_driver *line_driver,
struct line_driver *line_driver,
struct tty_operations *ops, struct line *lines,
int nlines)
{
......@@ -656,7 +661,7 @@ struct tty_driver *line_register_devfs(struct lines *set,
}
for(i = 0; i < nlines; i++){
if(!lines[i].valid)
if(!lines[i].valid)
tty_unregister_device(driver, i);
}
......@@ -677,11 +682,12 @@ void lines_init(struct line *lines, int nlines)
line = &lines[i];
INIT_LIST_HEAD(&line->chan_list);
spin_lock_init(&line->lock);
if(line->init_str != NULL){
line->init_str = kstrdup(line->init_str, GFP_KERNEL);
if(line->init_str == NULL)
printk("lines_init - kstrdup returned NULL\n");
}
if(line->init_str == NULL)
continue;
line->init_str = kstrdup(line->init_str, GFP_KERNEL);
if(line->init_str == NULL)
printk("lines_init - kstrdup returned NULL\n");
}
}
......@@ -717,8 +723,7 @@ irqreturn_t winch_interrupt(int irq, void *data, struct pt_regs *unused)
tty = winch->tty;
if (tty != NULL) {
line = tty->driver_data;
chan_window_size(&line->chan_list,
&tty->winsize.ws_row,
chan_window_size(&line->chan_list, &tty->winsize.ws_row,
&tty->winsize.ws_col);
kill_pg(tty->pgrp, SIGWINCH, 1);
}
......@@ -749,7 +754,7 @@ void register_winch_irq(int fd, int tty_fd, int pid, struct tty_struct *tty)
spin_unlock(&winch_handler_lock);
if(um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt,
SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM,
SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM,
"winch", winch) < 0)
printk("register_winch_irq - failed to register IRQ\n");
}
......@@ -800,7 +805,7 @@ static void winch_cleanup(void)
deactivate_fd(winch->fd, WINCH_IRQ);
os_close_file(winch->fd);
}
if(winch->pid != -1)
if(winch->pid != -1)
os_kill_process(winch->pid, 1);
}
}
......
......@@ -34,7 +34,7 @@
#include "irq_kern.h"
#include "choose-mode.h"
static int do_unlink_socket(struct notifier_block *notifier,
static int do_unlink_socket(struct notifier_block *notifier,
unsigned long what, void *data)
{
return(mconsole_unlink_socket());
......@@ -46,7 +46,7 @@ static struct notifier_block reboot_notifier = {
.priority = 0,
};
/* Safe without explicit locking for now. Tasklets provide their own
/* Safe without explicit locking for now. Tasklets provide their own
* locking, and the interrupt handler is safe because it can't interrupt
* itself and it can only happen on CPU 0.
*/
......@@ -60,7 +60,7 @@ static void mc_work_proc(void *unused)
while(!list_empty(&mc_requests)){
local_save_flags(flags);
req = list_entry(mc_requests.next, struct mconsole_entry,
req = list_entry(mc_requests.next, struct mconsole_entry,
list);
list_del(&req->list);
local_irq_restore(flags);
......@@ -103,8 +103,8 @@ void mconsole_version(struct mc_request *req)
{
char version[256];
sprintf(version, "%s %s %s %s %s", system_utsname.sysname,
system_utsname.nodename, system_utsname.release,
sprintf(version, "%s %s %s %s %s", system_utsname.sysname,
system_utsname.nodename, system_utsname.release,
system_utsname.version, system_utsname.machine);
mconsole_reply(req, version, 0, 0);
}
......@@ -348,7 +348,7 @@ static struct mc_device *mconsole_find_dev(char *name)
#define CONFIG_BUF_SIZE 64
static void mconsole_get_config(int (*get_config)(char *, char *, int,
static void mconsole_get_config(int (*get_config)(char *, char *, int,
char **),
struct mc_request *req, char *name)
{
......@@ -389,7 +389,6 @@ static void mconsole_get_config(int (*get_config)(char *, char *, int,
out:
if(buf != default_buf)
kfree(buf);
}
void mconsole_config(struct mc_request *req)
......@@ -420,7 +419,7 @@ void mconsole_config(struct mc_request *req)
void mconsole_remove(struct mc_request *req)
{
struct mc_device *dev;
struct mc_device *dev;
char *ptr = req->request.data, *err_msg = "";
char error[256];
int err, start, end, n;
......@@ -534,7 +533,7 @@ void mconsole_stack(struct mc_request *req)
/* Changed by mconsole_setup, which is __setup, and called before SMP is
* active.
*/
static char *notify_socket = NULL;
static char *notify_socket = NULL;
int mconsole_init(void)
{
......@@ -566,13 +565,13 @@ int mconsole_init(void)
notify_socket = kstrdup(notify_socket, GFP_KERNEL);
if(notify_socket != NULL)
mconsole_notify(notify_socket, MCONSOLE_SOCKET,
mconsole_socket_name,
mconsole_socket_name,
strlen(mconsole_socket_name) + 1);
else printk(KERN_ERR "mconsole_setup failed to strdup "
"string\n");
}
printk("mconsole (version %d) initialized on %s\n",
printk("mconsole (version %d) initialized on %s\n",
MCONSOLE_VERSION, mconsole_socket_name);
return(0);
}
......@@ -585,7 +584,7 @@ static int write_proc_mconsole(struct file *file, const char __user *buffer,
char *buf;
buf = kmalloc(count + 1, GFP_KERNEL);
if(buf == NULL)
if(buf == NULL)
return(-ENOMEM);
if(copy_from_user(buf, buffer, count)){
......@@ -661,7 +660,7 @@ static int notify_panic(struct notifier_block *self, unsigned long unused1,
if(notify_socket == NULL) return(0);
mconsole_notify(notify_socket, MCONSOLE_PANIC, message,
mconsole_notify(notify_socket, MCONSOLE_PANIC, message,
strlen(message) + 1);
return(0);
}
......
......@@ -69,7 +69,7 @@ static struct line_driver driver = {
.name = "ssl",
.config = ssl_config,
.get_config = ssl_get_config,
.id = line_id,
.id = line_id,
.remove = ssl_remove,
},
};
......@@ -84,21 +84,21 @@ static struct lines lines = LINES_INIT(NR_PORTS);
static int ssl_config(char *str)
{
return(line_config(serial_lines,
sizeof(serial_lines)/sizeof(serial_lines[0]), str));
return line_config(serial_lines,
sizeof(serial_lines)/sizeof(serial_lines[0]), str);
}
static int ssl_get_config(char *dev, char *str, int size, char **error_out)
{
return(line_get_config(dev, serial_lines,
sizeof(serial_lines)/sizeof(serial_lines[0]),
str, size, error_out));
return line_get_config(dev, serial_lines,
sizeof(serial_lines)/sizeof(serial_lines[0]),
str, size, error_out);