ptrace: s/parent/real_parent/ in binfmt_elf_fdpic.c

[karo-tx-linux.git] / fs / proc / proc_tty.c

diff --git a/fs/proc/proc_tty.c b/fs/proc/proc_tty.c
index 854827b1d4639db46b7b2f2065d4de86d63ae425..83adcc86943742ef58bf22b4fb16a986a560450e 100644 (file)
--- a/fs/proc/proc_tty.c
+++ b/fs/proc/proc_tty.c
@@ -144,22 +144,12 @@ 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 = proc_create_data(driver->driver_name, 0, proc_tty_driver,
+                              driver->ops->proc_fops, driver);
        driver->proc_entry = ent;
 }