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>

diff --git a/drivers/staging/ozwpan/ozhcd.c b/drivers/staging/ozwpan/ozhcd.c
index b30c4d87c25e8b2f599e2f358ca7ada3043a853d..ba2168f53559aff3df7a1d3c6b150589a3e5ddb6 100644 (file)
--- 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 26c104946a822646fbb3a995df488201e69b8da7..852c288aaf13132398263c3c3d24b49627a29892 100644 (file)
--- 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);