lkml.org 
[lkml]   [2009]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 17/17] proc tty: remove struct tty_operations::read_proc
    struct tty_operations::proc_fops took it's place and there is one less
    create_proc_read_entry() user now!

    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    ---
    drivers/isdn/capi/capi.c | 7 -------
    fs/proc/proc_tty.c | 21 ++++++---------------
    include/linux/tty_driver.h | 2 --
    net/bluetooth/rfcomm/tty.c | 6 ------
    4 files changed, 6 insertions(+), 30 deletions(-)

    diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
    index 1b5bf87..8506cc5 100644
    --- a/drivers/isdn/capi/capi.c
    +++ b/drivers/isdn/capi/capi.c
    @@ -1331,12 +1331,6 @@ static void capinc_tty_send_xchar(struct tty_struct *tty, char ch)
    #endif
    }

    -static int capinc_tty_read_proc(char *page, char **start, off_t off,
    - int count, int *eof, void *data)
    -{
    - return 0;
    -}
    -
    static struct tty_driver *capinc_tty_driver;

    static const struct tty_operations capinc_ops = {
    @@ -1358,7 +1352,6 @@ static const struct tty_operations capinc_ops = {
    .flush_buffer = capinc_tty_flush_buffer,
    .set_ldisc = capinc_tty_set_ldisc,
    .send_xchar = capinc_tty_send_xchar,
    - .read_proc = capinc_tty_read_proc,
    };

    static int capinc_tty_init(void)
    diff --git a/fs/proc/proc_tty.c b/fs/proc/proc_tty.c
    index 2b72dbf..f1d4eb8 100644
    --- a/fs/proc/proc_tty.c
    +++ b/fs/proc/proc_tty.c
    @@ -144,23 +144,14 @@ void proc_tty_register_driver(struct tty_driver *driver)
    {
    struct proc_dir_entry *ent;

    - if (!driver->driver_name || driver->proc_entry)
    + if (!driver->driver_name || driver->proc_entry ||
    + !driver->ops->proc_fops)
    return;

    - if (driver->ops->proc_fops) {
    - ent = proc_create_data(driver->driver_name, 0, proc_tty_driver,
    - driver->ops->proc_fops, driver);
    - if (!ent)
    - return;
    - } else if (driver->ops->read_proc) {
    - ent = create_proc_entry(driver->driver_name, 0, proc_tty_driver);
    - if (!ent)
    - return;
    - ent->read_proc = driver->ops->read_proc;
    - ent->data = driver;
    - } else
    - return;
    - ent->owner = driver->owner;
    + ent = proc_create_data(driver->driver_name, 0, proc_tty_driver,
    + driver->ops->proc_fops, driver);
    + if (ent)
    + ent->owner = driver->owner;

    driver->proc_entry = ent;
    }
    diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
    index c9a6957..8615d66 100644
    --- a/include/linux/tty_driver.h
    +++ b/include/linux/tty_driver.h
    @@ -252,8 +252,6 @@ struct tty_operations {
    void (*set_ldisc)(struct tty_struct *tty);
    void (*wait_until_sent)(struct tty_struct *tty, int timeout);
    void (*send_xchar)(struct tty_struct *tty, char ch);
    - int (*read_proc)(char *page, char **start, off_t off,
    - int count, int *eof, void *data);
    int (*tiocmget)(struct tty_struct *tty, struct file *file);
    int (*tiocmset)(struct tty_struct *tty, struct file *file,
    unsigned int set, unsigned int clear);
    diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
    index d030c69..58a653e 100644
    --- a/net/bluetooth/rfcomm/tty.c
    +++ b/net/bluetooth/rfcomm/tty.c
    @@ -1092,11 +1092,6 @@ static void rfcomm_tty_hangup(struct tty_struct *tty)
    }
    }

    -static int rfcomm_tty_read_proc(char *buf, char **start, off_t offset, int len, int *eof, void *unused)
    -{
    - return 0;
    -}
    -
    static int rfcomm_tty_tiocmget(struct tty_struct *tty, struct file *filp)
    {
    struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
    @@ -1155,7 +1150,6 @@ static const struct tty_operations rfcomm_ops = {
    .send_xchar = rfcomm_tty_send_xchar,
    .hangup = rfcomm_tty_hangup,
    .wait_until_sent = rfcomm_tty_wait_until_sent,
    - .read_proc = rfcomm_tty_read_proc,
    .tiocmget = rfcomm_tty_tiocmget,
    .tiocmset = rfcomm_tty_tiocmset,
    };
    --
    1.5.6.5


    \
     
     \ /
      Last update: 2009-01-29 18:53    [W:4.195 / U:0.312 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site