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

Commit ab283202 authored Jan 17, 2017 by John Youn Committed by Felipe Balbi Jan 24, 2017

usb: dwc2: Fix logical continuations



Fix the formatting of logical statements to end the line with the
logical operator.

Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

parent 38beaec6

drivers/usb/dwc2/core_intr.c

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -159,9 +159,8 @@ static void dwc2_handle_otg_intr(struct dwc2_hsotg *hsotg)
	" ++OTG Interrupt: Session Request Success Status Change++\n");		" ++OTG Interrupt: Session Request Success Status Change++\n");
	gotgctl = dwc2_readl(hsotg->regs + GOTGCTL);		gotgctl = dwc2_readl(hsotg->regs + GOTGCTL);
	if (gotgctl & GOTGCTL_SESREQSCS) {		if (gotgctl & GOTGCTL_SESREQSCS) {
	if (hsotg->params.phy_type ==		if (hsotg->params.phy_type == DWC2_PHY_TYPE_PARAM_FS &&
	DWC2_PHY_TYPE_PARAM_FS		hsotg->params.i2c_enable > 0) {
	&& hsotg->params.i2c_enable > 0) {
	hsotg->srp_success = 1;		hsotg->srp_success = 1;
	} else {		} else {
	/* Clear Session Request */		/* Clear Session Request */

drivers/usb/dwc2/hcd_ddma.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -89,8 +89,8 @@ static int dwc2_desc_list_alloc(struct dwc2_hsotg hsotg, struct dwc2_qh qh,
	{		{
	struct kmem_cache *desc_cache;		struct kmem_cache *desc_cache;

	if (qh->ep_type == USB_ENDPOINT_XFER_ISOC		if (qh->ep_type == USB_ENDPOINT_XFER_ISOC &&
	&& qh->dev_speed == USB_SPEED_HIGH)		qh->dev_speed == USB_SPEED_HIGH)
	desc_cache = hsotg->desc_hsisoc_cache;		desc_cache = hsotg->desc_hsisoc_cache;
	else		else
	desc_cache = hsotg->desc_gen_cache;		desc_cache = hsotg->desc_gen_cache;
	@@ -123,8 +123,8 @@ static void dwc2_desc_list_free(struct dwc2_hsotg hsotg, struct dwc2_qh qh)
	{		{
	struct kmem_cache *desc_cache;		struct kmem_cache *desc_cache;

	if (qh->ep_type == USB_ENDPOINT_XFER_ISOC		if (qh->ep_type == USB_ENDPOINT_XFER_ISOC &&
	&& qh->dev_speed == USB_SPEED_HIGH)		qh->dev_speed == USB_SPEED_HIGH)
	desc_cache = hsotg->desc_hsisoc_cache;		desc_cache = hsotg->desc_hsisoc_cache;
	else		else
	desc_cache = hsotg->desc_gen_cache;		desc_cache = hsotg->desc_gen_cache;

drivers/usb/dwc2/hcd_queue.c

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -76,9 +76,8 @@ static int dwc2_periodic_channel_available(struct dwc2_hsotg *hsotg)
	int num_channels;		int num_channels;

	num_channels = hsotg->params.host_channels;		num_channels = hsotg->params.host_channels;
	if (hsotg->periodic_channels + hsotg->non_periodic_channels <		if ((hsotg->periodic_channels + hsotg->non_periodic_channels <
	num_channels		num_channels) && (hsotg->periodic_channels < num_channels - 1)) {
	&& hsotg->periodic_channels < num_channels - 1) {
	status = 0;		status = 0;
	} else {		} else {
	dev_dbg(hsotg->dev,		dev_dbg(hsotg->dev,