Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34c0887f authored by John Youn's avatar John Youn Committed by Felipe Balbi
Browse files

usb: dwc2: Fix brace usage 



* Remove braces for one-line statements
* Add missing braces where another arm in if-statement uses braces

Signed-off-by: default avatarJohn Youn <johnyoun@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent ab283202

drivers/usb/dwc2/gadget.c

+4 −6
Original line number Diff line number Diff line
@@ -1644,10 +1644,9 @@ 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,10 +1937,9 @@ 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);

}

}



/*

 * dwc2_gadget_complete_isoc_request_ddma - complete an isoc request in DDMA
@@ -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 ||

drivers/usb/dwc2/platform.c

+6 −6
Original line number Diff line number Diff line
@@ -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);