Skip to content

Commit

Permalink
CAPI: Drop return value of handle_minor_send
Browse files Browse the repository at this point in the history
We did not evaluate handle_minor_send's return value, just (void)'ed it
away. Time for a cleanup.

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jan Kiszka authored and David S. Miller committed Feb 17, 2010
1 parent 2b72b5b commit eef0ced
Showing 1 changed file with 9 additions and 13 deletions.
22 changes: 9 additions & 13 deletions drivers/isdn/capi/capi.c
Original file line number Diff line number Diff line change
Expand Up @@ -516,25 +516,24 @@ static void handle_minor_recv(struct capiminor *mp)
}
}

static int handle_minor_send(struct capiminor *mp)
static void handle_minor_send(struct capiminor *mp)
{
struct tty_struct *tty;
struct sk_buff *skb;
u16 len;
int count = 0;
u16 errcode;
u16 datahandle;

tty = tty_port_tty_get(&mp->port);
if (!tty)
return 0;
return;

if (mp->ttyoutstop) {
#if defined(_DEBUG_DATAFLOW) || defined(_DEBUG_TTYFUNCS)
printk(KERN_DEBUG "capi: send: tty stopped\n");
#endif
tty_kref_put(tty);
return 0;
return;
}

while (1) {
Expand Down Expand Up @@ -570,12 +569,10 @@ static int handle_minor_send(struct capiminor *mp)
mp->outbytes += len;
spin_unlock_bh(&mp->outlock);

tty_kref_put(tty);
return count;
break;
}
errcode = capi20_put_message(mp->ap, skb);
if (errcode == CAPI_NOERROR) {
count++;
#ifdef _DEBUG_DATAFLOW
printk(KERN_DEBUG "capi: DATA_B3_REQ %u len=%u\n",
datahandle, len);
Expand All @@ -600,7 +597,6 @@ static int handle_minor_send(struct capiminor *mp)
kfree_skb(skb);
}
tty_kref_put(tty);
return count;
}

#endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
Expand Down Expand Up @@ -677,7 +673,7 @@ static void capi_recv_message(struct capi20_appl *ap, struct sk_buff *skb)
tty_wakeup(tty);
tty_kref_put(tty);
}
(void)handle_minor_send(mp);
handle_minor_send(mp);

} else {
/* ups, let capi application handle it :-) */
Expand Down Expand Up @@ -1114,7 +1110,7 @@ static int capinc_tty_write(struct tty_struct *tty,
mp->outbytes += skb->len;
spin_unlock_bh(&mp->outlock);

(void)handle_minor_send(mp);
handle_minor_send(mp);

return count;
}
Expand Down Expand Up @@ -1157,7 +1153,7 @@ static int capinc_tty_put_char(struct tty_struct *tty, unsigned char ch)
spin_unlock_bh(&mp->outlock);

if (invoke_send)
(void)handle_minor_send(mp);
handle_minor_send(mp);

return ret;
}
Expand All @@ -1179,7 +1175,7 @@ static void capinc_tty_flush_chars(struct tty_struct *tty)
mp->outbytes += skb->len;
spin_unlock_bh(&mp->outlock);

(void)handle_minor_send(mp);
handle_minor_send(mp);
} else
spin_unlock_bh(&mp->outlock);

Expand Down Expand Up @@ -1269,7 +1265,7 @@ static void capinc_tty_start(struct tty_struct *tty)
printk(KERN_DEBUG "capinc_tty_start\n");
#endif
mp->ttyoutstop = 0;
(void)handle_minor_send(mp);
handle_minor_send(mp);
}

static void capinc_tty_hangup(struct tty_struct *tty)
Expand Down

0 comments on commit eef0ced

Please sign in to comment.