Skip to content

Commit

Permalink
ath6kl: remove unnecessary check for NULL skb
Browse files Browse the repository at this point in the history
dev_kfree_skb kernel API itself takes for checking for NULL
skb, so an explicit check is not required.

Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
  • Loading branch information
Mohammed Shafi Shajakhan authored and kvalo committed Nov 27, 2012
1 parent 895dc38 commit e16ccfe
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 17 deletions.
8 changes: 3 additions & 5 deletions drivers/net/wireless/ath/ath6kl/htc_pipe.c
Original file line number Diff line number Diff line change
Expand Up @@ -509,9 +509,7 @@ static void destroy_htc_txctrl_packet(struct htc_packet *packet)
{
struct sk_buff *skb;
skb = packet->skb;
if (skb != NULL)
dev_kfree_skb(skb);

dev_kfree_skb(skb);
kfree(packet);
}

Expand Down Expand Up @@ -1054,6 +1052,7 @@ static int ath6kl_htc_pipe_rx_complete(struct ath6kl *ar, struct sk_buff *skb,

dev_kfree_skb(skb);
skb = NULL;

goto free_skb;
}

Expand Down Expand Up @@ -1089,8 +1088,7 @@ static int ath6kl_htc_pipe_rx_complete(struct ath6kl *ar, struct sk_buff *skb,
skb = NULL;

free_skb:
if (skb != NULL)
dev_kfree_skb(skb);
dev_kfree_skb(skb);

return status;

Expand Down
6 changes: 2 additions & 4 deletions drivers/net/wireless/ath/ath6kl/usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,8 @@ static void ath6kl_usb_free_urb_to_pipe(struct ath6kl_usb_pipe *pipe,

static void ath6kl_usb_cleanup_recv_urb(struct ath6kl_urb_context *urb_context)
{
if (urb_context->skb != NULL) {
dev_kfree_skb(urb_context->skb);
urb_context->skb = NULL;
}
dev_kfree_skb(urb_context->skb);
urb_context->skb = NULL;

ath6kl_usb_free_urb_to_pipe(urb_context->pipe, urb_context);
}
Expand Down
11 changes: 3 additions & 8 deletions drivers/net/wireless/ath/ath6kl/wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -2481,16 +2481,11 @@ static int ath6kl_wmi_sync_point(struct wmi *wmi, u8 if_idx)

free_cmd_skb:
/* free up any resources left over (possibly due to an error) */
if (skb)
dev_kfree_skb(skb);
dev_kfree_skb(skb);

free_data_skb:
for (index = 0; index < num_pri_streams; index++) {
if (data_sync_bufs[index].skb != NULL) {
dev_kfree_skb((struct sk_buff *)data_sync_bufs[index].
skb);
}
}
for (index = 0; index < num_pri_streams; index++)
dev_kfree_skb((struct sk_buff *)data_sync_bufs[index].skb);

return ret;
}
Expand Down

0 comments on commit e16ccfe

Please sign in to comment.