lkml.org 
[lkml]   [2012]   [Jun]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 14/24] PTY: remove one empty ops->remove
    Date
    Currently, there are two as a left-over from previous patches.
    Although we really need to provide an empty handler, we do not need
    two. So remove one of them.

    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/tty/pty.c | 10 +++-------
    1 file changed, 3 insertions(+), 7 deletions(-)

    diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
    index 5505ffc..4bcaf89 100644
    --- a/drivers/tty/pty.c
    +++ b/drivers/tty/pty.c
    @@ -557,18 +557,14 @@ err_free_tty:
    return -ENOMEM;
    }

    -static void ptm_unix98_remove(struct tty_driver *driver, struct tty_struct *tty)
    -{
    -}
    -
    -static void pts_unix98_remove(struct tty_driver *driver, struct tty_struct *tty)
    +static void pty_unix98_remove(struct tty_driver *driver, struct tty_struct *tty)
    {
    }

    static const struct tty_operations ptm_unix98_ops = {
    .lookup = ptm_unix98_lookup,
    .install = pty_unix98_install,
    - .remove = ptm_unix98_remove,
    + .remove = pty_unix98_remove,
    .open = pty_open,
    .close = pty_close,
    .write = pty_write,
    @@ -585,7 +581,7 @@ static const struct tty_operations ptm_unix98_ops = {
    static const struct tty_operations pty_unix98_ops = {
    .lookup = pts_unix98_lookup,
    .install = pty_unix98_install,
    - .remove = pts_unix98_remove,
    + .remove = pty_unix98_remove,
    .open = pty_open,
    .close = pty_close,
    .write = pty_write,
    --
    1.7.10.3



    \
     
     \ /
      Last update: 2012-06-04 17:01    [W:0.022 / U:33.612 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site