isdn/gigaset: avoid copying AT commands twice

Change the Gigaset driver's internal write_cmd interface to accept a
cmdbuf structure instead of a string. This avoids copying formatted
AT commands a second time.

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

1 files changed, 5 insertions, 22 deletions

diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
index e96c0586886c..d151dcbf770d 100644
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
@@ -241,30 +241,13 @@ static void flush_send_queue(struct cardstate *cs)
  * return value:
  *      number of bytes queued, or error code < 0
  */
-static int gigaset_write_cmd(struct cardstate *cs, const unsigned char *buf,
-                             int len, struct tasklet_struct *wake_tasklet)
+static int gigaset_write_cmd(struct cardstate *cs, struct cmdbuf_t *cb)
 {
-        struct cmdbuf_t *cb;
         unsigned long flags;
 
         gigaset_dbg_buffer(cs->mstate != MS_LOCKED ?
                                 DEBUG_TRANSCMD : DEBUG_LOCKCMD,
-                           "CMD Transmit", len, buf);
-
-        if (len <= 0)
-                return 0;
-
-        cb = kmalloc(sizeof(struct cmdbuf_t) + len, GFP_ATOMIC);
-        if (!cb) {
-                dev_err(cs->dev, "%s: out of memory!\n", __func__);
-                return -ENOMEM;
-        }
-
-        memcpy(cb->buf, buf, len);
-        cb->len = len;
-        cb->offset = 0;
-        cb->next = NULL;
-        cb->wake_tasklet = wake_tasklet;
+                           "CMD Transmit", cb->len, cb->buf);
 
         spin_lock_irqsave(&cs->cmdlock, flags);
         cb->prev = cs->lastcmdbuf;
@@ -272,9 +255,9 @@ static int gigaset_write_cmd(struct cardstate *cs, const unsigned char *buf,
                 cs->lastcmdbuf->next = cb;
         else {
                 cs->cmdbuf = cb;
-                cs->curlen = len;
+                cs->curlen = cb->len;
         }
-        cs->cmdbytes += len;
+        cs->cmdbytes += cb->len;
         cs->lastcmdbuf = cb;
         spin_unlock_irqrestore(&cs->cmdlock, flags);
 
@@ -282,7 +265,7 @@ static int gigaset_write_cmd(struct cardstate *cs, const unsigned char *buf,
         if (cs->connected)
                 tasklet_schedule(&cs->write_tasklet);
         spin_unlock_irqrestore(&cs->lock, flags);
-        return len;
+        return cb->len;
 }
 
 /*