lkml.org 
[lkml]   [2005]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/11] uml console channels: fix the API of console_write
    Date
    From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

    Since the 4th param is unused, remove it altogether.

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    ---

    arch/um/drivers/chan_kern.c | 5 ++---
    arch/um/drivers/chan_user.c | 2 +-
    arch/um/include/chan_user.h | 4 ++--
    3 files changed, 5 insertions(+), 6 deletions(-)

    diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
    --- a/arch/um/drivers/chan_kern.c
    +++ b/arch/um/drivers/chan_kern.c
    @@ -89,8 +89,7 @@ static int not_configged_write(int fd, c
    return(-EIO);
    }

    -static int not_configged_console_write(int fd, const char *buf, int len,
    - void *data)
    +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");
    @@ -299,7 +298,7 @@ int console_write_chan(struct list_head
    chan = list_entry(ele, struct chan, list);
    if(!chan->output || (chan->ops->console_write == NULL))
    continue;
    - n = chan->ops->console_write(chan->fd, buf, len, chan->data);
    + n = chan->ops->console_write(chan->fd, buf, len);
    if(chan->primary) ret = n;
    }
    return(ret);
    diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
    --- a/arch/um/drivers/chan_user.c
    +++ b/arch/um/drivers/chan_user.c
    @@ -21,7 +21,7 @@
    #include "choose-mode.h"
    #include "mode.h"

    -int generic_console_write(int fd, const char *buf, int n, void *unused)
    +int generic_console_write(int fd, const char *buf, int n)
    {
    struct termios save, new;
    int err;
    diff --git a/arch/um/include/chan_user.h b/arch/um/include/chan_user.h
    --- a/arch/um/include/chan_user.h
    +++ b/arch/um/include/chan_user.h
    @@ -25,7 +25,7 @@ struct chan_ops {
    void (*close)(int, void *);
    int (*read)(int, char *, void *);
    int (*write)(int, const char *, int, void *);
    - int (*console_write)(int, const char *, int, void *);
    + int (*console_write)(int, const char *, int);
    int (*window_size)(int, void *, unsigned short *, unsigned short *);
    void (*free)(void *);
    int winch;
    @@ -37,7 +37,7 @@ extern struct chan_ops fd_ops, null_ops,
    extern void generic_close(int fd, void *unused);
    extern int generic_read(int fd, char *c_out, void *unused);
    extern int generic_write(int fd, const char *buf, int n, void *unused);
    -extern int generic_console_write(int fd, const char *buf, int n, void *state);
    +extern int generic_console_write(int fd, const char *buf, int n);
    extern int generic_window_size(int fd, void *unused, unsigned short *rows_out,
    unsigned short *cols_out);
    extern void generic_free(void *data);
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-10-26 00:08    [W:0.021 / U:34.472 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site