isdn/gigaset: beautify interface.c

Avoid forward declarations and remove a needless initialization.

Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 15 insertions, 31 deletions

diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
index 67abf3ff45e8..20b7e7a1190f 100644
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@ -112,36 +112,6 @@ static int if_config(struct cardstate *cs, int *arg)
 }
 
 /*** the terminal driver ***/
-/* stolen from usbserial and some other tty drivers */
-
-static int  if_open(struct tty_struct *tty, struct file *filp);
-static void if_close(struct tty_struct *tty, struct file *filp);
-static int  if_ioctl(struct tty_struct *tty,
-                     unsigned int cmd, unsigned long arg);
-static int  if_write_room(struct tty_struct *tty);
-static int  if_chars_in_buffer(struct tty_struct *tty);
-static void if_throttle(struct tty_struct *tty);
-static void if_unthrottle(struct tty_struct *tty);
-static void if_set_termios(struct tty_struct *tty, struct ktermios *old);
-static int  if_tiocmget(struct tty_struct *tty);
-static int  if_tiocmset(struct tty_struct *tty,
-                        unsigned int set, unsigned int clear);
-static int  if_write(struct tty_struct *tty,
-                     const unsigned char *buf, int count);
-
-static const struct tty_operations if_ops = {
-        .open =                 if_open,
-        .close =                if_close,
-        .ioctl =                if_ioctl,
-        .write =                if_write,
-        .write_room =           if_write_room,
-        .chars_in_buffer =      if_chars_in_buffer,
-        .set_termios =          if_set_termios,
-        .throttle =             if_throttle,
-        .unthrottle =           if_unthrottle,
-        .tiocmget =             if_tiocmget,
-        .tiocmset =             if_tiocmset,
-};
 
 static int if_open(struct tty_struct *tty, struct file *filp)
 {
@@ -355,7 +325,7 @@ done:
 static int if_write_room(struct tty_struct *tty)
 {
         struct cardstate *cs = tty->driver_data;
-        int retval = -ENODEV;
+        int retval;
 
         gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
 
@@ -498,6 +468,20 @@ out:
         mutex_unlock(&cs->mutex);
 }
 
+static const struct tty_operations if_ops = {
+        .open =                 if_open,
+        .close =                if_close,
+        .ioctl =                if_ioctl,
+        .write =                if_write,
+        .write_room =           if_write_room,
+        .chars_in_buffer =      if_chars_in_buffer,
+        .set_termios =          if_set_termios,
+        .throttle =             if_throttle,
+        .unthrottle =           if_unthrottle,
+        .tiocmget =             if_tiocmget,
+        .tiocmset =             if_tiocmset,
+};
+
 
 /* wakeup tasklet for the write operation */
 static void if_wake(unsigned long data)