Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 443e1f45 authored by Tilman Schmidt's avatar Tilman Schmidt Committed by Linus Torvalds
Browse files

[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: default avatarHansjoerg Lipp <hjlipp@web.de>
Signed-off-by: default avatarTilman Schmidt <tilman@imap.cc>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent abfd1dc7

drivers/isdn/gigaset/asyncdata.c

+2 −3
Original line number Diff line number Diff line
@@ -252,8 +252,7 @@ static inline int hdlc_loop(unsigned char c, unsigned char *src, int numbytes, 
				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))

drivers/isdn/gigaset/gigaset.h

+0 −17
Original line number Diff line number Diff line
@@ -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!

 */

drivers/isdn/gigaset/isocdata.c

+1 −1
Original line number Diff line number Diff line
@@ -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