[PATCH] isdn4linux: Siemens Gigaset drivers: remove private version of __skb_put()

With Hansjoerg Lipp <hjlipp@web.de>

Remove the private version of __skb_put() from the Siemens Gigaset drivers.

Signed-off-by: Hansjoerg Lipp <hjlipp@web.de>
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/isdn/gigaset/asyncdata.c b/drivers/isdn/gigaset/asyncdata.c
index 4f5dd9cf9e1bd1920f6944e3f9d367a80cd7697b..2d2a6b6b83ff102fd0177185801b066dea30de0f 100644 (file)
--- a/drivers/isdn/gigaset/asyncdata.c
+++ b/drivers/isdn/gigaset/asyncdata.c
@@ -252,8 +252,7 @@ byte_stuff:
                                inputstate |= INS_skip_frame;
                                break;
                        }
-                       *gigaset_skb_put_quick(skb, 1) = c;
-                       /* *__skb_put (skb, 1) = c; */
+                       *__skb_put(skb, 1) = c;
                        fcs = crc_ccitt_byte(fcs, c);
                }
 
@@ -303,7 +302,7 @@ static inline int iraw_loop(unsigned char c, unsigned char *src, int numbytes,
                                inputstate |= INS_skip_frame;
                                break;
                        }
-                       *gigaset_skb_put_quick(skb, 1) = gigaset_invtab[c];
+                       *__skb_put(skb, 1) = gigaset_invtab[c];
                }
 
                if (unlikely(!numbytes))

diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index 12153acc23e4412820075791b7b5dc722f05122c..3596096ca073d06b2527ef9a8d8ad31a51d273d4 100644 (file)
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -852,23 +852,6 @@ static inline void gigaset_bchannel_up(struct bc_state *bcs)
 /* handling routines for sk_buff */
 /* ============================= */
 
-/* private version of __skb_put()
- * append 'len' bytes to the content of 'skb', already knowing that the
- * existing buffer can accomodate them
- * returns a pointer to the location where the new bytes should be copied to
- * This function does not take any locks so it must be called with the
- * appropriate locks held only.
- */
-static inline unsigned char *gigaset_skb_put_quick(struct sk_buff *skb,
-                                                  unsigned int len)
-{
-       unsigned char *tmp = skb->tail;
-       /*SKB_LINEAR_ASSERT(skb);*/             /* not needed here */
-       skb->tail += len;
-       skb->len += len;
-       return tmp;
-}
-
 /* pass received skb to LL
  * Warning: skb must not be accessed anymore!
  */

diff --git a/drivers/isdn/gigaset/isocdata.c b/drivers/isdn/gigaset/isocdata.c
index 5f2f47fdc045f12c0059e081867ba2ff357a78fd..2f1628734a38d35a2e6f733f7e02ffc55b55dcae 100644 (file)
--- a/drivers/isdn/gigaset/isocdata.c
+++ b/drivers/isdn/gigaset/isocdata.c
@@ -532,7 +532,7 @@ static inline void hdlc_putbyte(unsigned char c, struct bc_state *bcs)
                bcs->skb = NULL;
                return;
        }
-       *gigaset_skb_put_quick(bcs->skb, 1) = c;
+       *__skb_put(bcs->skb, 1) = c;
 }
 
 /* hdlc_flush