diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2017-06-16 08:29:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-16 11:48:39 -0400 |
| commit | af72868b9070d1b843c829f0d0d0b22c04a20815 (patch) | |
| tree | 537bb273e315e1238cff969adbfc70cb35ba9a44 /net/bluetooth | |
| parent | 4df864c1d9afb46e2461a9f808d9f11a42d31bad (diff) | |
networking: make skb_pull & friends return void pointers
It seems like a historic accident that these return unsigned char *,
and in many places that means casts are required, more often than not.
Make these functions return void * and remove all the casts across
the tree, adding a (u8 *) cast only where the unsigned char pointer
was used directly, all done with the following spatch:
@@
expression SKB, LEN;
typedef u8;
identifier fn = {
skb_pull,
__skb_pull,
skb_pull_inline,
__pskb_pull_tail,
__pskb_pull,
pskb_pull
};
@@
- *(fn(SKB, LEN))
+ *(u8 *)fn(SKB, LEN)
@@
expression E, SKB, LEN;
identifier fn = {
skb_pull,
__skb_pull,
skb_pull_inline,
__pskb_pull_tail,
__pskb_pull,
pskb_pull
};
type T;
@@
- E = ((T *)(fn(SKB, LEN)))
+ E = fn(SKB, LEN)
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/a2mp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c index f0095fd79818..aad994edd3bb 100644 --- a/net/bluetooth/a2mp.c +++ b/net/bluetooth/a2mp.c | |||
| @@ -239,7 +239,7 @@ static int a2mp_discover_rsp(struct amp_mgr *mgr, struct sk_buff *skb, | |||
| 239 | } | 239 | } |
| 240 | 240 | ||
| 241 | len -= sizeof(*cl); | 241 | len -= sizeof(*cl); |
| 242 | cl = (void *) skb_pull(skb, sizeof(*cl)); | 242 | cl = skb_pull(skb, sizeof(*cl)); |
| 243 | } | 243 | } |
| 244 | 244 | ||
| 245 | /* Fall back to L2CAP init sequence */ | 245 | /* Fall back to L2CAP init sequence */ |
| @@ -279,7 +279,7 @@ static int a2mp_change_notify(struct amp_mgr *mgr, struct sk_buff *skb, | |||
| 279 | while (skb->len >= sizeof(*cl)) { | 279 | while (skb->len >= sizeof(*cl)) { |
| 280 | BT_DBG("Controller id %d type %d status %d", cl->id, cl->type, | 280 | BT_DBG("Controller id %d type %d status %d", cl->id, cl->type, |
| 281 | cl->status); | 281 | cl->status); |
| 282 | cl = (struct a2mp_cl *) skb_pull(skb, sizeof(*cl)); | 282 | cl = skb_pull(skb, sizeof(*cl)); |
| 283 | } | 283 | } |
| 284 | 284 | ||
| 285 | /* TODO send A2MP_CHANGE_RSP */ | 285 | /* TODO send A2MP_CHANGE_RSP */ |
