Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB: serial: io_edgeport: fix up switch fall-through comments

Gustavo has been working to fix up all of the switch statements that
"fall through" such that we can eventually turn on
-Wimplicit-fallthrough. As part of that, the io_edgeport.c driver is a
bit "messy" with the parsing logic of a data packet. Clean that logic
up a bit by unindenting one level of the logic, and properly label
/* Fall through */ to make gcc happy.

Reported-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Johan Hovold <johan@kernel.org>

authored by

Greg Kroah-Hartman and committed by
Johan Hovold
deb55e40 80ed5370

+14 -23
+14 -23
drivers/usb/serial/io_edgeport.c
··· 1751 1751 edge_serial->rxState = EXPECT_HDR2; 1752 1752 break; 1753 1753 } 1754 - /* otherwise, drop on through */ 1754 + /* Fall through */ 1755 1755 case EXPECT_HDR2: 1756 1756 edge_serial->rxHeader2 = *buffer; 1757 1757 ++buffer; ··· 1790 1790 edge_serial->rxHeader2, 0); 1791 1791 edge_serial->rxState = EXPECT_HDR1; 1792 1792 break; 1793 - } else { 1794 - edge_serial->rxPort = 1795 - IOSP_GET_HDR_PORT(edge_serial->rxHeader1); 1796 - edge_serial->rxBytesRemaining = 1797 - IOSP_GET_HDR_DATA_LEN( 1798 - edge_serial->rxHeader1, 1799 - edge_serial->rxHeader2); 1800 - dev_dbg(dev, "%s - Data for Port %u Len %u\n", 1801 - __func__, 1802 - edge_serial->rxPort, 1803 - edge_serial->rxBytesRemaining); 1804 - 1805 - /* ASSERT(DevExt->RxPort < DevExt->NumPorts); 1806 - * ASSERT(DevExt->RxBytesRemaining < 1807 - * IOSP_MAX_DATA_LENGTH); 1808 - */ 1809 - 1810 - if (bufferLength == 0) { 1811 - edge_serial->rxState = EXPECT_DATA; 1812 - break; 1813 - } 1814 - /* Else, drop through */ 1815 1793 } 1794 + 1795 + edge_serial->rxPort = IOSP_GET_HDR_PORT(edge_serial->rxHeader1); 1796 + edge_serial->rxBytesRemaining = IOSP_GET_HDR_DATA_LEN(edge_serial->rxHeader1, 1797 + edge_serial->rxHeader2); 1798 + dev_dbg(dev, "%s - Data for Port %u Len %u\n", __func__, 1799 + edge_serial->rxPort, 1800 + edge_serial->rxBytesRemaining); 1801 + 1802 + if (bufferLength == 0) { 1803 + edge_serial->rxState = EXPECT_DATA; 1804 + break; 1805 + } 1806 + /* Fall through */ 1816 1807 case EXPECT_DATA: /* Expect data */ 1817 1808 if (bufferLength < edge_serial->rxBytesRemaining) { 1818 1809 rxLen = bufferLength;