staging: ozwpan: Separate success & failure case for oz_hcd_pd_arrived()

This patch separates success & failure block along with fixing
following issues:-

1. The way oz_hcd_pd_arrived() looks now it's easy to think we free "ep" but
actually we do this spaghetti thing of setting it to NULL on success.

2. It is hard to read it because there are unlocks scattered throughout.

3. Currently we set "ep" to NULL on the success path and then test it and or
free it. In current code you have to scroll to the start of the function
to read code.

Original patch was submitted by Dan here :-
http://driverdev.linuxdriverproject.org/pipermail/driverdev-devel/2013-August/040113.html

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Rupesh Gujare <rupesh.gujare@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/ozwpan/ozhcd.c b/drivers/staging/ozwpan/ozhcd.c
index 0b21c9f4d2e3e1c1adc139232131c2b05da7fede..4cd08daf5111960f061ea01975931993ee7d27df 100644 (file)
--- a/drivers/staging/ozwpan/ozhcd.c
+++ b/drivers/staging/ozwpan/ozhcd.c
@@ -668,50 +668,50 @@ struct oz_port *oz_hcd_pd_arrived(void *hpd)
        struct oz_endpoint *ep;
 
        ozhcd = oz_hcd_claim();
-       if (ozhcd == NULL)
+       if (!ozhcd)
                return NULL;
        /* Allocate an endpoint object in advance (before holding hcd lock) to
         * use for out endpoint 0.
         */
        ep = oz_ep_alloc(0, GFP_ATOMIC);
+       if (!ep)
+               goto err_put;
+
        spin_lock_bh(&ozhcd->hcd_lock);
-       if (ozhcd->conn_port >= 0) {
-               spin_unlock_bh(&ozhcd->hcd_lock);
-               oz_dbg(ON, "conn_port >= 0\n");
-               goto out;
-       }
+       if (ozhcd->conn_port >= 0)
+               goto err_unlock;
+
        for (i = 0; i < OZ_NB_PORTS; i++) {
                struct oz_port *port = &ozhcd->ports[i];
+
                spin_lock(&port->port_lock);
-               if ((port->flags & OZ_PORT_F_PRESENT) == 0) {
+               if (!(port->flags & OZ_PORT_F_PRESENT)) {
                        oz_acquire_port(port, hpd);
                        spin_unlock(&port->port_lock);
                        break;
                }
                spin_unlock(&port->port_lock);
        }
-       if (i < OZ_NB_PORTS) {
-               oz_dbg(ON, "Setting conn_port = %d\n", i);
-               ozhcd->conn_port = i;
-               /* Attach out endpoint 0.
-                */
-               ozhcd->ports[i].out_ep[0] = ep;
-               ep = NULL;
-               hport = &ozhcd->ports[i];
-               spin_unlock_bh(&ozhcd->hcd_lock);
-               if (ozhcd->flags & OZ_HDC_F_SUSPENDED) {
-                       oz_dbg(ON, "Resuming root hub\n");
-                       usb_hcd_resume_root_hub(ozhcd->hcd);
-               }
-               usb_hcd_poll_rh_status(ozhcd->hcd);
-       } else {
-               spin_unlock_bh(&ozhcd->hcd_lock);
-       }
-out:
-       if (ep) /* ep is non-null if not used. */
-               oz_ep_free(NULL, ep);
+       if (i == OZ_NB_PORTS)
+               goto err_unlock;
+
+       ozhcd->conn_port = i;
+       hport = &ozhcd->ports[i];
+       hport->out_ep[0] = ep;
+       spin_unlock_bh(&ozhcd->hcd_lock);
+       if (ozhcd->flags & OZ_HDC_F_SUSPENDED)
+               usb_hcd_resume_root_hub(ozhcd->hcd);
+       usb_hcd_poll_rh_status(ozhcd->hcd);
        oz_hcd_put(ozhcd);
+
        return hport;
+
+err_unlock:
+       spin_unlock_bh(&ozhcd->hcd_lock);
+       oz_ep_free(NULL, ep);
+err_put:
+       oz_hcd_put(ozhcd);
+       return NULL;
 }
 
 /*------------------------------------------------------------------------------