Commit 5e128475 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman

staging: dwc2: remove some indent levels

Instead of writing code like:

	if (dwc2_qh_is_non_per(qh)) {
		...
	} else {
		...
	}
	return;

write it like:

	if (dwc2_qh_is_non_per(qh)) {
		...
		return;
	}
	...
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarPaul Zimmerman <paulz@synopsys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d31e6ca4
...@@ -594,18 +594,19 @@ int dwc2_hcd_qh_add(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh) ...@@ -594,18 +594,19 @@ int dwc2_hcd_qh_add(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
/* Always start in inactive schedule */ /* Always start in inactive schedule */
list_add_tail(&qh->qh_list_entry, list_add_tail(&qh->qh_list_entry,
&hsotg->non_periodic_sched_inactive); &hsotg->non_periodic_sched_inactive);
} else { return 0;
status = dwc2_schedule_periodic(hsotg, qh);
if (status)
return status;
if (!hsotg->periodic_qh_count) {
intr_mask = readl(hsotg->regs + GINTMSK);
intr_mask |= GINTSTS_SOF;
writel(intr_mask, hsotg->regs + GINTMSK);
}
hsotg->periodic_qh_count++;
} }
status = dwc2_schedule_periodic(hsotg, qh);
if (status)
return status;
if (!hsotg->periodic_qh_count) {
intr_mask = readl(hsotg->regs + GINTMSK);
intr_mask |= GINTSTS_SOF;
writel(intr_mask, hsotg->regs + GINTMSK);
}
hsotg->periodic_qh_count++;
return 0; return 0;
} }
...@@ -631,14 +632,15 @@ void dwc2_hcd_qh_unlink(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh) ...@@ -631,14 +632,15 @@ void dwc2_hcd_qh_unlink(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
hsotg->non_periodic_qh_ptr = hsotg->non_periodic_qh_ptr =
hsotg->non_periodic_qh_ptr->next; hsotg->non_periodic_qh_ptr->next;
list_del_init(&qh->qh_list_entry); list_del_init(&qh->qh_list_entry);
} else { return;
dwc2_deschedule_periodic(hsotg, qh); }
hsotg->periodic_qh_count--;
if (!hsotg->periodic_qh_count) { dwc2_deschedule_periodic(hsotg, qh);
intr_mask = readl(hsotg->regs + GINTMSK); hsotg->periodic_qh_count--;
intr_mask &= ~GINTSTS_SOF; if (!hsotg->periodic_qh_count) {
writel(intr_mask, hsotg->regs + GINTMSK); intr_mask = readl(hsotg->regs + GINTMSK);
} intr_mask &= ~GINTSTS_SOF;
writel(intr_mask, hsotg->regs + GINTMSK);
} }
} }
...@@ -693,6 +695,8 @@ static void dwc2_sched_periodic_split(struct dwc2_hsotg *hsotg, ...@@ -693,6 +695,8 @@ static void dwc2_sched_periodic_split(struct dwc2_hsotg *hsotg,
void dwc2_hcd_qh_deactivate(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh, void dwc2_hcd_qh_deactivate(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh,
int sched_next_periodic_split) int sched_next_periodic_split)
{ {
u16 frame_number;
if (dbg_qh(qh)) if (dbg_qh(qh))
dev_vdbg(hsotg->dev, "%s()\n", __func__); dev_vdbg(hsotg->dev, "%s()\n", __func__);
...@@ -701,37 +705,36 @@ void dwc2_hcd_qh_deactivate(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh, ...@@ -701,37 +705,36 @@ void dwc2_hcd_qh_deactivate(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh,
if (!list_empty(&qh->qtd_list)) if (!list_empty(&qh->qtd_list))
/* Add back to inactive non-periodic schedule */ /* Add back to inactive non-periodic schedule */
dwc2_hcd_qh_add(hsotg, qh); dwc2_hcd_qh_add(hsotg, qh);
return;
}
frame_number = dwc2_hcd_get_frame_number(hsotg);
if (qh->do_split) {
dwc2_sched_periodic_split(hsotg, qh, frame_number,
sched_next_periodic_split);
} else { } else {
u16 frame_number = dwc2_hcd_get_frame_number(hsotg); qh->sched_frame = dwc2_frame_num_inc(qh->sched_frame,
qh->interval);
if (qh->do_split) { if (dwc2_frame_num_le(qh->sched_frame, frame_number))
dwc2_sched_periodic_split(hsotg, qh, frame_number, qh->sched_frame = frame_number;
sched_next_periodic_split); }
} else {
qh->sched_frame = dwc2_frame_num_inc(qh->sched_frame,
qh->interval);
if (dwc2_frame_num_le(qh->sched_frame, frame_number))
qh->sched_frame = frame_number;
}
if (list_empty(&qh->qtd_list)) { if (list_empty(&qh->qtd_list)) {
dwc2_hcd_qh_unlink(hsotg, qh); dwc2_hcd_qh_unlink(hsotg, qh);
} else { return;
/*
* Remove from periodic_sched_queued and move to
* appropriate queue
*/
if ((hsotg->core_params->uframe_sched > 0 &&
dwc2_frame_num_le(qh->sched_frame, frame_number))
|| (hsotg->core_params->uframe_sched <= 0 &&
qh->sched_frame == frame_number))
list_move(&qh->qh_list_entry,
&hsotg->periodic_sched_ready);
else
list_move(&qh->qh_list_entry,
&hsotg->periodic_sched_inactive);
}
} }
/*
* Remove from periodic_sched_queued and move to
* appropriate queue
*/
if ((hsotg->core_params->uframe_sched > 0 &&
dwc2_frame_num_le(qh->sched_frame, frame_number)) ||
(hsotg->core_params->uframe_sched <= 0 &&
qh->sched_frame == frame_number))
list_move(&qh->qh_list_entry, &hsotg->periodic_sched_ready);
else
list_move(&qh->qh_list_entry, &hsotg->periodic_sched_inactive);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment