diff options
| author | Adrian Nicoara <anicoara@uwaterloo.ca> | 2014-09-08 14:41:48 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-08 13:26:33 -0700 |
| commit | d75b6c6154267618363f0126bd50c73f8d448a24 (patch) | |
| tree | 3e839460ae17c48116acdff3bc9544ec567bad1b /drivers/staging/ozwpan | |
| parent | ce6880e17508b31e04628a71d4691ef4a00a8b3f (diff) | |
| download | op-kernel-dev-d75b6c6154267618363f0126bd50c73f8d448a24.zip op-kernel-dev-d75b6c6154267618363f0126bd50c73f8d448a24.tar.gz | |
staging: ozwpan: fix redundant else after break or return
Cleanup checkpatch.pl warnings.
Signed-off-by: Adrian Nicoara <anicoara@uwaterloo.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ozwpan')
| -rw-r--r-- | drivers/staging/ozwpan/ozhcd.c | 8 | ||||
| -rw-r--r-- | drivers/staging/ozwpan/ozpd.c | 10 |
2 files changed, 7 insertions, 11 deletions
diff --git a/drivers/staging/ozwpan/ozhcd.c b/drivers/staging/ozwpan/ozhcd.c index b30c4d87..ba2168f 100644 --- a/drivers/staging/ozwpan/ozhcd.c +++ b/drivers/staging/ozwpan/ozhcd.c @@ -1010,10 +1010,9 @@ void oz_hcd_data_ind(void *hport, u8 endpoint, const u8 *data, int data_len) urb->actual_length = copy_len; oz_complete_urb(port->ozhcd->hcd, urb, 0); return; - } else { - oz_dbg(ON, "buffering frame as URB is not available\n"); - oz_hcd_buffer_data(ep, data, data_len); } + oz_dbg(ON, "buffering frame as URB is not available\n"); + oz_hcd_buffer_data(ep, data, data_len); break; case USB_ENDPOINT_XFER_ISOC: oz_hcd_buffer_data(ep, data, data_len); @@ -1903,8 +1902,7 @@ static int oz_hcd_hub_status_data(struct usb_hcd *hcd, char *buf) spin_unlock_bh(&ozhcd->hcd_lock); if (buf[0] != 0 || buf[1] != 0) return 2; - else - return 0; + return 0; } /* diff --git a/drivers/staging/ozwpan/ozpd.c b/drivers/staging/ozwpan/ozpd.c index 26c1049..852c288 100644 --- a/drivers/staging/ozwpan/ozpd.c +++ b/drivers/staging/ozwpan/ozpd.c @@ -496,11 +496,10 @@ static int oz_send_next_queued_frame(struct oz_pd *pd, int more_data) oz_dbg(TX_FRAMES, "Sending ISOC Frame, nb_isoc= %d\n", pd->nb_queued_isoc_frames); return 0; - } else { - kfree_skb(skb); - oz_dbg(TX_FRAMES, "Dropping ISOC Frame>\n"); - return -1; } + kfree_skb(skb); + oz_dbg(TX_FRAMES, "Dropping ISOC Frame>\n"); + return -1; } pd->last_sent_frame = e; @@ -813,8 +812,7 @@ int oz_send_isoc_unit(struct oz_pd *pd, u8 ep_num, const u8 *data, int len) atomic_inc(&g_submitted_isoc); if (dev_queue_xmit(skb) < 0) return -1; - else - return 0; + return 0; } out: kfree_skb(skb); |
