staging: dgap: removes redundant null check and change paramter for dgap_maxcps_room()

Null checks for tty, un and ch are already done by caller,
so replace parameter "tty" with "ch" and "un".

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index cc21dd228ba80473a2bc40659fb1ad4d4aae5398..9affc5bf7228ac283d7fc7fdf1d0cc23952df1e6 100644 (file)
--- a/drivers/staging/dgap/dgap.c
+++ b/drivers/staging/dgap/dgap.c
@@ -2507,22 +2507,9 @@ static int dgap_wait_for_drain(struct tty_struct *tty)
  * returns the new bytes_available.  This only affects printer
  * output.
  */
-static int dgap_maxcps_room(struct tty_struct *tty, int bytes_available)
+static int dgap_maxcps_room(struct channel_t *ch, struct un_t *un,
+                           int bytes_available)
 {
-       struct channel_t *ch;
-       struct un_t *un;
-
-       if (!tty)
-               return bytes_available;
-
-       un = tty->driver_data;
-       if (!un || un->magic != DGAP_UNIT_MAGIC)
-               return bytes_available;
-
-       ch = un->un_ch;
-       if (!ch || ch->magic != DGAP_CHANNEL_MAGIC)
-               return bytes_available;
-
        /*
         * If its not the Transparent print device, return
         * the full data amount.
@@ -2624,7 +2611,7 @@ static int dgap_tty_write_room(struct tty_struct *tty)
                ret += ch->ch_tsize;
 
        /* Limit printer to maxcps */
-       ret = dgap_maxcps_room(tty, ret);
+       ret = dgap_maxcps_room(ch, un, ret);
 
        /*
         * If we are printer device, leave space for
@@ -2729,7 +2716,7 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf,
         * Limit printer output to maxcps overall, with bursts allowed
         * up to bufsize characters.
         */
-       bufcount = dgap_maxcps_room(tty, bufcount);
+       bufcount = dgap_maxcps_room(ch, un, bufcount);
 
        /*
         * Take minimum of what the user wants to send, and the