remove the braces in case: {}

now that the variables are defined at top scope, no more need for double-scope
in switch case statements

Author: Josuah Demangeon

drivers/usb/uhc/uhc_dwc2.c

@@ -318,6 +318,7 @@ void dwc2_hal_flush_rx_fifo(struct usb_dwc2_reg *const dwc2)
 {
 	sys_write32(USB_DWC2_GRSTCTL_RXFFLSH, (mem_addr_t)&dwc2->grstctl);
 	while (sys_read32((mem_addr_t)&dwc2->grstctl) & USB_DWC2_GRSTCTL_RXFFLSH) {
+		continue;
 	}
 }
 
@@ -329,6 +330,7 @@ void dwc2_hal_flush_tx_fifo(struct usb_dwc2_reg *const dwc2, const uint8_t fnum)
 
 	sys_write32(grstctl, (mem_addr_t)&dwc2->grstctl);
 	while (sys_read32((mem_addr_t)&dwc2->grstctl) & USB_DWC2_GRSTCTL_TXFFLSH) {
+		continue;
 	}
 }
 
@@ -688,24 +690,21 @@ static enum uhc_port_event uhc_dwc2_decode_hprt(const struct device *dev,
 	enum uhc_port_event port_event = UHC_PORT_EVENT_NONE;
 
 	switch (core_event) {
-	case UHC_DWC2_CORE_EVENT_CONN: {
+	case UHC_DWC2_CORE_EVENT_CONN:
 		port_event = UHC_PORT_EVENT_CONNECTION;
 		break;
-	}
-	case UHC_DWC2_CORE_EVENT_DISCONN: {
+	case UHC_DWC2_CORE_EVENT_DISCONN:
 		/* TODO: priv->port_state = UHC_PORT_STATE_RECOVERY */
 		port_event = UHC_PORT_EVENT_DISCONNECTION;
 		priv->conn_dev_ena = 0;
 		break;
-	}
-	case UHC_DWC2_CORE_EVENT_ENABLED: {
+	case UHC_DWC2_CORE_EVENT_ENABLED:
 		/* Initialize remaining host port registers */
 		dwc2_port_enable(dev);
 		port_event = UHC_PORT_EVENT_ENABLED;
 		priv->conn_dev_ena = 1;
 		break;
-	}
-	case UHC_DWC2_CORE_EVENT_DISABLED: {
+	case UHC_DWC2_CORE_EVENT_DISABLED:
 		priv->conn_dev_ena = 0;
 		/* Could be due to a disable request or reset request, or due to a port error */
 		/* Ignore the disable event if it's due to a reset request */
@@ -727,9 +726,8 @@ static enum uhc_port_event uhc_dwc2_decode_hprt(const struct device *dev,
 			}
 		}
 		break;
-	}
 	case UHC_DWC2_CORE_EVENT_OVRCUR:
-	case UHC_DWC2_CORE_EVENT_OVRCUR_CLR: {
+	case UHC_DWC2_CORE_EVENT_OVRCUR_CLR:
 		/* TODO: Handle overcurrent event */
 
 		/* If port state powered, we need to power it off to protect it
@@ -740,12 +738,10 @@ static enum uhc_port_event uhc_dwc2_decode_hprt(const struct device *dev,
 
 		LOG_ERR("Overcurrent detected on port, not implemented yet");
 		break;
-	}
-	default: {
+	default:
 		__ASSERT(false, "Unexpected core event %d", core_event);
 		break;
 	}
-	}
 	return port_event;
 }
 
@@ -957,15 +953,13 @@ static void IRAM_ATTR _buffer_fill(struct uhc_dwc2_chan *chan)
 	/* TODO: Double buffering scheme? */
 
 	switch (chan->type) {
-	case UHC_DWC2_XFER_TYPE_CTRL: {
+	case UHC_DWC2_XFER_TYPE_CTRL:
 		_buffer_fill_ctrl(chan, xfer);
 		break;
-	}
-	default: {
+	default:
 		LOG_ERR("Unsupported transfer type %d", chan->type);
 		break;
 	}
-	}
 	/* TODO: sync CACHE */
 }
 
@@ -1099,11 +1093,10 @@ static enum uhc_dwc2_chan_event uhc_dwc2_decode_chan(const struct device *dev,
 	LOG_DBG("Channel event: %d", chan_event);
 
 	switch (chan_event) {
-	case DWC2_CHAN_EVENT_NONE: {
+	case DWC2_CHAN_EVENT_NONE:
 		/* No event, nothing to do */
 		break;
-	}
-	case DWC2_CHAN_EVENT_CPLT: {
+	case DWC2_CHAN_EVENT_CPLT:
 		if (!_buffer_is_done(chan)) {
 			_buffer_exec_proceed(dev, chan);
 			break;
@@ -1112,13 +1105,11 @@ static enum uhc_dwc2_chan_event uhc_dwc2_decode_chan(const struct device *dev,
 		ret = chan->last_event;
 		_buffer_done(dev, chan, chan->last_event, false);
 		break;
-	}
-	case DWC2_CHAN_EVENT_ERROR: {
+	case DWC2_CHAN_EVENT_ERROR:
 		LOG_ERR("Channel error handling not implemented yet");
 		/* TODO: get channel error, halt the chan */
 		break;
-	}
-	case DWC2_CHAN_EVENT_HALT_REQ: {
+	case DWC2_CHAN_EVENT_HALT_REQ:
 		LOG_ERR("Channel halt request handling not implemented yet");
 
 		__ASSERT(chan->waiting_halt, "Pipe is not watiting to be halted");
@@ -1136,7 +1127,6 @@ static enum uhc_dwc2_chan_event uhc_dwc2_decode_chan(const struct device *dev,
 		 * _internal_chan_event_notify(chan, true);
 		 */
 		break;
-	}
 	default:
 		/* Should never happen */
 		LOG_WRN("Unknown channel event %d", chan_event);
@@ -1278,7 +1268,7 @@ static inline enum uhc_port_event uhc_dwc2_get_port_event(const struct device *d
 		port_event = priv->last_event;
 
 		switch (port_event) {
-		case UHC_PORT_EVENT_CONNECTION: {
+		case UHC_PORT_EVENT_CONNECTION:
 			/* Don't update state immediately, we still need to debounce. */
 			if (uhc_dwc2_port_debounce(dev)) {
 				port_event = UHC_PORT_EVENT_CONNECTION;
@@ -1288,16 +1278,13 @@ static inline enum uhc_port_event uhc_dwc2_get_port_event(const struct device *d
 				LOG_WRN("Port debounce error handling is not implemented yet");
 			}
 			break;
-		}
 		case UHC_PORT_EVENT_DISCONNECTION:
 		case UHC_PORT_EVENT_ERROR:
-		case UHC_PORT_EVENT_OVERCURRENT: {
+		case UHC_PORT_EVENT_OVERCURRENT:
 			break;
-		}
-		default: {
+		default:
 			break;
 		}
-		}
 	} else {
 		port_event = UHC_PORT_EVENT_NONE;
 	}
@@ -1613,12 +1600,12 @@ static inline void uhc_dwc2_handle_port_events(const struct device *dev)
 	case UHC_PORT_EVENT_NONE:
 		/* No event, nothing to do */
 		break;
-	case UHC_PORT_EVENT_CONNECTION: {
+
+	case UHC_PORT_EVENT_CONNECTION:
 		uhc_dwc2_port_reset(dev);
 		break;
-	}
 
-	case UHC_PORT_EVENT_ENABLED: {
+	case UHC_PORT_EVENT_ENABLED:
 		/* TODO: enter critical section */
 		priv->port_state = UHC_PORT_STATE_ENABLED;
 		/* TODO: exit critical section */
@@ -1639,10 +1626,10 @@ static inline void uhc_dwc2_handle_port_events(const struct device *dev)
 		/* Notify the higher logic about the new device */
 		uhc_dwc2_submit_new_device(dev, port_speed);
 		break;
-	}
+
 	case UHC_PORT_EVENT_DISCONNECTION:
 	case UHC_PORT_EVENT_ERROR:
-	case UHC_PORT_EVENT_OVERCURRENT: {
+	case UHC_PORT_EVENT_OVERCURRENT:
 		port_has_device = false;
 
 		/* TODO: enter critical section */
@@ -1667,7 +1654,6 @@ static inline void uhc_dwc2_handle_port_events(const struct device *dev)
 		/* Recover the port */
 		uhc_dwc2_port_recovery(dev);
 		break;
-	}
 	default:
 		break;
 	}