[PATCH 10/13] isdn4linux: Siemens Gigaset drivers - remove private version of __skb_put()

[Hansjoerg Lipp]

From: Tilman Schmidt <tilman@xxxxxxx>, Hansjoerg Lipp <hjlipp@xxxxxx>

This patch removes the private version of __skb_put() from the Siemens
Gigaset drivers. Please merge.

Signed-off-by: Hansjoerg Lipp <hjlipp@xxxxxx>
Signed-off-by: Tilman Schmidt <tilman@xxxxxxx>
---

 drivers/isdn/gigaset/asyncdata.c |    5 ++---
 drivers/isdn/gigaset/gigaset.h   |   17 -----------------
 drivers/isdn/gigaset/isocdata.c  |    2 +-
 3 files changed, 3 insertions(+), 21 deletions(-)

--- linux-2.6.16-gig-mutex/drivers/isdn/gigaset/gigaset.h	2006-04-02 18:43:41.000000000 +0200
+++ linux-2.6.16-gig-skb/drivers/isdn/gigaset/gigaset.h	2006-04-02 18:44:06.000000000 +0200
@@ -852,23 +852,6 @@ static inline void gigaset_bchannel_up(s
 /* 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!
  */
--- linux-2.6.16-gig-mutex/drivers/isdn/gigaset/isocdata.c	2006-04-02 18:43:01.000000000 +0200
+++ linux-2.6.16-gig-skb/drivers/isdn/gigaset/isocdata.c	2006-04-02 18:44:06.000000000 +0200
@@ -532,7 +532,7 @@ static inline void hdlc_putbyte(unsigned
 		bcs->skb = NULL;
 		return;
 	}
-	*gigaset_skb_put_quick(bcs->skb, 1) = c;
+	*__skb_put(bcs->skb, 1) = c;
 }
 
 /* hdlc_flush
--- linux-2.6.16-gig-mutex/drivers/isdn/gigaset/asyncdata.c	2006-04-02 18:43:01.000000000 +0200
+++ linux-2.6.16-gig-skb/drivers/isdn/gigaset/asyncdata.c	2006-04-02 18:44:06.000000000 +0200
@@ -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 cha
 				inputstate |= INS_skip_frame;
 				break;
 			}
-			*gigaset_skb_put_quick(skb, 1) = gigaset_invtab[c];
+			*__skb_put(skb, 1) = gigaset_invtab[c];
 		}
 
 		if (unlikely(!numbytes))
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/