evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

isdn/gigaset: elliminate unnecessary argument from send_cb()

Browse source 
No need to pass a member of the cardstate structure as a separate
argument if the entire structure is already passed.

Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tilman Schmidt 2014-12-10 13:41:55 +01:00 • committed by David S. Miller
parent f650dd2805
commit f99a6fde9a
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/isdn/gigaset/usb-gigaset.c
View file

@ -293,7 +293,7 @@ static int gigaset_close_bchannel(struct bc_state *bcs)
} }
static int write_modem(struct cardstate *cs); static int write_modem(struct cardstate *cs);
static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb); static int send_cb(struct cardstate *cs);
/* Write tasklet handler: Continue sending current skb, or send command, or /* Write tasklet handler: Continue sending current skb, or send command, or
@ -303,7 +303,6 @@ static void gigaset_modem_fill(unsigned long data)
{ {
struct cardstate *cs = (struct cardstate *) data; struct cardstate *cs = (struct cardstate *) data;
struct bc_state *bcs = &cs->bcs[0]; /* only one channel */ struct bc_state *bcs = &cs->bcs[0]; /* only one channel */
struct cmdbuf_t *cb;
gig_dbg(DEBUG_OUTPUT, "modem_fill"); gig_dbg(DEBUG_OUTPUT, "modem_fill");
@ -314,10 +313,9 @@ static void gigaset_modem_fill(unsigned long data)
again: again:
if (!bcs->tx_skb) { /* no skb is being sent */ if (!bcs->tx_skb) { /* no skb is being sent */
cb = cs->cmdbuf; if (cs->cmdbuf) { /* commands to send? */
if (cb) { /* commands to send? */
gig_dbg(DEBUG_OUTPUT, "modem_fill: cb"); gig_dbg(DEBUG_OUTPUT, "modem_fill: cb");
if (send_cb(cs, cb) < 0) { if (send_cb(cs) < 0) {
gig_dbg(DEBUG_OUTPUT, gig_dbg(DEBUG_OUTPUT,
"modem_fill: send_cb failed"); "modem_fill: send_cb failed");
goto again; /* no callback will be called! */ goto again; /* no callback will be called! */
@ -425,9 +423,9 @@ static void gigaset_write_bulk_callback(struct urb *urb)
spin_unlock_irqrestore(&cs->lock, flags); spin_unlock_irqrestore(&cs->lock, flags);
} }
static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb) static int send_cb(struct cardstate *cs)
{ {
struct cmdbuf_t *tcb; struct cmdbuf_t *cb = cs->cmdbuf;
unsigned long flags; unsigned long flags;
int count; int count;
int status = -ENOENT; int status = -ENOENT;
@ -435,26 +433,27 @@ static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb)
do { do {
if (!cb->len) { if (!cb->len) {
tcb = cb;
spin_lock_irqsave(&cs->cmdlock, flags); spin_lock_irqsave(&cs->cmdlock, flags);
cs->cmdbytes -= cs->curlen; cs->cmdbytes -= cs->curlen;
gig_dbg(DEBUG_OUTPUT, "send_cb: sent %u bytes, %u left", gig_dbg(DEBUG_OUTPUT, "send_cb: sent %u bytes, %u left",
cs->curlen, cs->cmdbytes); cs->curlen, cs->cmdbytes);
cs->cmdbuf = cb = cb->next; cs->cmdbuf = cb->next;
if (cb) { if (cs->cmdbuf) {
cb->prev = NULL; cs->cmdbuf->prev = NULL;
cs->curlen = cb->len; cs->curlen = cs->cmdbuf->len;
} else { } else {
cs->lastcmdbuf = NULL; cs->lastcmdbuf = NULL;
cs->curlen = 0; cs->curlen = 0;
} }
spin_unlock_irqrestore(&cs->cmdlock, flags); spin_unlock_irqrestore(&cs->cmdlock, flags);
if (tcb->wake_tasklet) if (cb->wake_tasklet)
tasklet_schedule(tcb->wake_tasklet); tasklet_schedule(cb->wake_tasklet);
kfree(tcb); kfree(cb);
cb = cs->cmdbuf;
} }
if (cb) { if (cb) {
count = min(cb->len, ucs->bulk_out_size); count = min(cb->len, ucs->bulk_out_size);
gig_dbg(DEBUG_OUTPUT, "send_cb: send %d bytes", count); gig_dbg(DEBUG_OUTPUT, "send_cb: send %d bytes", count);