]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
usb: dwc2: Fix brace usage
authorJohn Youn <John.Youn@synopsys.com>
Wed, 18 Jan 2017 04:31:43 +0000 (20:31 -0800)
committerFelipe Balbi <felipe.balbi@linux.intel.com>
Tue, 24 Jan 2017 09:04:19 +0000 (11:04 +0200)
* Remove braces for one-line statements
* Add missing braces where another arm in if-statement uses braces

Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
drivers/usb/dwc2/gadget.c
drivers/usb/dwc2/platform.c

index ca6313101354cd093550c8fa96bea89b3b4e5223..3190ffc439804ae5aa8e9a37695278c50076463d 100644 (file)
@@ -1644,9 +1644,8 @@ static int dwc2_hsotg_process_req_feature(struct dwc2_hsotg *hsotg,
                                }
 
                                /* If we have pending request, then start it */
-                               if (!ep->req) {
+                               if (!ep->req)
                                        dwc2_gadget_start_next_request(ep);
-                               }
                        }
 
                        break;
@@ -1938,9 +1937,8 @@ static void dwc2_hsotg_complete_request(struct dwc2_hsotg *hsotg,
         * so be careful when doing this.
         */
 
-       if (!hs_ep->req && result >= 0) {
+       if (!hs_ep->req && result >= 0)
                dwc2_gadget_start_next_request(hs_ep);
-       }
 }
 
 /*
@@ -4051,9 +4049,9 @@ static int dwc2_hsotg_ep_sethalt(struct usb_ep *ep, int value, bool now)
                epreg = DOEPCTL(index);
                epctl = dwc2_readl(hs->regs + epreg);
 
-               if (value)
+               if (value) {
                        epctl |= DXEPCTL_STALL;
-               else {
+               else {
                        epctl &= ~DXEPCTL_STALL;
                        xfertype = epctl & DXEPCTL_EPTYPE_MASK;
                        if (xfertype == DXEPCTL_EPTYPE_BULK ||
index 649d7b9a714b26d48227231284034b86ffbd67b6..3f59a73de24886bd502d008f8a133cadad7e84e8 100644 (file)
@@ -136,11 +136,11 @@ static int __dwc2_lowlevel_hw_enable(struct dwc2_hsotg *hsotg)
                        return ret;
        }
 
-       if (hsotg->uphy)
+       if (hsotg->uphy) {
                ret = usb_phy_init(hsotg->uphy);
-       else if (hsotg->plat && hsotg->plat->phy_init)
+       } else if (hsotg->plat && hsotg->plat->phy_init) {
                ret = hsotg->plat->phy_init(pdev, hsotg->plat->phy_type);
-       else {
+       else {
                ret = phy_power_on(hsotg->phy);
                if (ret == 0)
                        ret = phy_init(hsotg->phy);
@@ -170,11 +170,11 @@ static int __dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg)
        struct platform_device *pdev = to_platform_device(hsotg->dev);
        int ret = 0;
 
-       if (hsotg->uphy)
+       if (hsotg->uphy) {
                usb_phy_shutdown(hsotg->uphy);
-       else if (hsotg->plat && hsotg->plat->phy_exit)
+       } else if (hsotg->plat && hsotg->plat->phy_exit) {
                ret = hsotg->plat->phy_exit(pdev, hsotg->plat->phy_type);
-       else {
+       else {
                ret = phy_exit(hsotg->phy);
                if (ret == 0)
                        ret = phy_power_off(hsotg->phy);