From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: USB: serial: io_edgeport: fix up switch fall-through comments From: Greg Kroah-Hartman Message-Id: <20190502173515.GA13801@kroah.com> Date: Thu, 2 May 2019 19:35:15 +0200 To: Johan Hovold Cc: linux-usb@vger.kernel.org, "Gustavo A. R. Silva" List-ID: R3VzdGF2byBoYXMgYmVlbiB3b3JraW5nIHRvIGZpeCB1cCBhbGwgb2YgdGhlIHN3aXRjaCBzdGF0 ZW1lbnRzIHRoYXQKImZhbGwgdGhyb3VnaCIgc3VjaCB0aGF0IHdlIGNhbiBldmVudHVhbGx5IHR1 cm4gb24KLVdpbXBsaWNpdC1mYWxsdGhyb3VnaC4gIEFzIHBhcnQgb2YgdGhhdCwgdGhlIGlvX2Vk Z2Vwb3J0LmMgZHJpdmVyIGlzIGEKYml0ICJtZXNzeSIgd2l0aCB0aGUgcGFyc2luZyBsb2dpYyBv ZiBhIGRhdGEgcGFja2V0LiAgQ2xlYW4gdGhhdCBsb2dpYwp1cCBhIGJpdCBieSB1bmluZGVudGlu ZyBvbmUgbGV2ZWwgb2YgdGhlIGxvZ2ljLCBhbmQgcHJvcGVybHkgbGFiZWwKLyogRmFsbCB0aHJv dWdoICovIHRvIG1ha2UgZ2NjIGhhcHB5LgoKUmVwb3J0ZWQtYnk6IEd1c3Rhdm8gQS4gUi4gU2ls dmEgPGd1c3Rhdm9AZW1iZWRkZWRvci5jb20+ClNpZ25lZC1vZmYtYnk6IEdyZWcgS3JvYWgtSGFy dG1hbiA8Z3JlZ2toQGxpbnV4Zm91bmRhdGlvbi5vcmc+CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy91 c2Ivc2VyaWFsL2lvX2VkZ2Vwb3J0LmMgYi9kcml2ZXJzL3VzYi9zZXJpYWwvaW9fZWRnZXBvcnQu YwppbmRleCA0Y2EzMWMwZTQxNzQuLjQ4YTQzOTI5OGE2OCAxMDA2NDQKLS0tIGEvZHJpdmVycy91 c2Ivc2VyaWFsL2lvX2VkZ2Vwb3J0LmMKKysrIGIvZHJpdmVycy91c2Ivc2VyaWFsL2lvX2VkZ2Vw b3J0LmMKQEAgLTE3NTEsNyArMTc1MSw3IEBAIHN0YXRpYyB2b2lkIHByb2Nlc3NfcmN2ZF9kYXRh KHN0cnVjdCBlZGdlcG9ydF9zZXJpYWwgKmVkZ2Vfc2VyaWFsLAogCQkJCWVkZ2Vfc2VyaWFsLT5y eFN0YXRlID0gRVhQRUNUX0hEUjI7CiAJCQkJYnJlYWs7CiAJCQl9Ci0JCQkvKiBvdGhlcndpc2Us IGRyb3Agb24gdGhyb3VnaCAqLworCQkJLyogRmFsbCB0aHJvdWdoICovCiAJCWNhc2UgRVhQRUNU X0hEUjI6CiAJCQllZGdlX3NlcmlhbC0+cnhIZWFkZXIyID0gKmJ1ZmZlcjsKIAkJCSsrYnVmZmVy OwpAQCAtMTc5MCwyOSArMTc5MCwyMCBAQCBzdGF0aWMgdm9pZCBwcm9jZXNzX3JjdmRfZGF0YShz dHJ1Y3QgZWRnZXBvcnRfc2VyaWFsICplZGdlX3NlcmlhbCwKIAkJCQkJCWVkZ2Vfc2VyaWFsLT5y eEhlYWRlcjIsIDApOwogCQkJCWVkZ2Vfc2VyaWFsLT5yeFN0YXRlID0gRVhQRUNUX0hEUjE7CiAJ CQkJYnJlYWs7Ci0JCQl9IGVsc2UgewotCQkJCWVkZ2Vfc2VyaWFsLT5yeFBvcnQgPQotCQkJCSAg ICBJT1NQX0dFVF9IRFJfUE9SVChlZGdlX3NlcmlhbC0+cnhIZWFkZXIxKTsKLQkJCQllZGdlX3Nl cmlhbC0+cnhCeXRlc1JlbWFpbmluZyA9Ci0JCQkJICAgIElPU1BfR0VUX0hEUl9EQVRBX0xFTigK LQkJCQkJCWVkZ2Vfc2VyaWFsLT5yeEhlYWRlcjEsCi0JCQkJCQllZGdlX3NlcmlhbC0+cnhIZWFk ZXIyKTsKLQkJCQlkZXZfZGJnKGRldiwgIiVzIC0gRGF0YSBmb3IgUG9ydCAldSBMZW4gJXVcbiIs Ci0JCQkJCV9fZnVuY19fLAotCQkJCQllZGdlX3NlcmlhbC0+cnhQb3J0LAotCQkJCQllZGdlX3Nl cmlhbC0+cnhCeXRlc1JlbWFpbmluZyk7Ci0KLQkJCQkvKiBBU1NFUlQoRGV2RXh0LT5SeFBvcnQg PCBEZXZFeHQtPk51bVBvcnRzKTsKLQkJCQkgKiBBU1NFUlQoRGV2RXh0LT5SeEJ5dGVzUmVtYWlu aW5nIDwKLQkJCQkgKgkJSU9TUF9NQVhfREFUQV9MRU5HVEgpOwotCQkJCSAqLwotCi0JCQkJaWYg KGJ1ZmZlckxlbmd0aCA9PSAwKSB7Ci0JCQkJCWVkZ2Vfc2VyaWFsLT5yeFN0YXRlID0gRVhQRUNU X0RBVEE7Ci0JCQkJCWJyZWFrOwotCQkJCX0KLQkJCQkvKiBFbHNlLCBkcm9wIHRocm91Z2ggKi8K IAkJCX0KKworCQkJZWRnZV9zZXJpYWwtPnJ4UG9ydCA9IElPU1BfR0VUX0hEUl9QT1JUKGVkZ2Vf c2VyaWFsLT5yeEhlYWRlcjEpOworCQkJZWRnZV9zZXJpYWwtPnJ4Qnl0ZXNSZW1haW5pbmcgPSBJ T1NQX0dFVF9IRFJfREFUQV9MRU4oZWRnZV9zZXJpYWwtPnJ4SGVhZGVyMSwKKwkJCQkJCQkJCSAg ICAgIGVkZ2Vfc2VyaWFsLT5yeEhlYWRlcjIpOworCQkJZGV2X2RiZyhkZXYsICIlcyAtIERhdGEg Zm9yIFBvcnQgJXUgTGVuICV1XG4iLCBfX2Z1bmNfXywKKwkJCQllZGdlX3NlcmlhbC0+cnhQb3J0 LAorCQkJCWVkZ2Vfc2VyaWFsLT5yeEJ5dGVzUmVtYWluaW5nKTsKKworCQkJaWYgKGJ1ZmZlckxl bmd0aCA9PSAwKSB7CisJCQkJZWRnZV9zZXJpYWwtPnJ4U3RhdGUgPSBFWFBFQ1RfREFUQTsKKwkJ CQlicmVhazsKKwkJCX0KKwkJCS8qIEZhbGwgdGhyb3VnaCAqLwogCQljYXNlIEVYUEVDVF9EQVRB OiAvKiBFeHBlY3QgZGF0YSAqLwogCQkJaWYgKGJ1ZmZlckxlbmd0aCA8IGVkZ2Vfc2VyaWFsLT5y eEJ5dGVzUmVtYWluaW5nKSB7CiAJCQkJcnhMZW4gPSBidWZmZXJMZW5ndGg7Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9BB40C43219 for ; Thu, 2 May 2019 17:35:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6926D20651 for ; Thu, 2 May 2019 17:35:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556818519; bh=glrT0xD7Wxbz120lJjL1WLCfrPCvj2RcVULiKr403Yg=; h=Date:From:To:Cc:Subject:List-ID:From; b=SXJE7SAi6hGgR5ZQxIoOEOrlzzKqrg6fseaefTzIoR54vbqlgTbJ8I7e668AM1dRP Gh+SaMh0801xKXYUYp9Qk9GWB2K5ubTO7JRrgiHf34V+YQh1bli5nSZOezGG4tDNEL A5D3Yr6aY6lWDcvH9bIR4fADJPkUCfGzVoQjZPto= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726443AbfEBRfS (ORCPT ); Thu, 2 May 2019 13:35:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:40366 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726434AbfEBRfS (ORCPT ); Thu, 2 May 2019 13:35:18 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 40FAA205F4; Thu, 2 May 2019 17:35:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556818517; bh=glrT0xD7Wxbz120lJjL1WLCfrPCvj2RcVULiKr403Yg=; h=Date:From:To:Cc:Subject:From; b=TzkqqI7I+fD68sIMDA92bE2UoRip6Ms2WRflI1vrbe85Oii5n0WvlKjONm9HObqUH 4uTX7gQ2ff9LnKv5KGuD/Ltd/ySSeQETwZcfVI0rJXMu7Vm/rMp0K3Vd3y9LGRWzot ypGJGmiPxQljrxd7G0uk0m9SyJVbZ0GuXmsaVqmQ= Date: Thu, 2 May 2019 19:35:15 +0200 From: Greg Kroah-Hartman To: Johan Hovold Cc: linux-usb@vger.kernel.org, "Gustavo A. R. Silva" Subject: [PATCH] USB: serial: io_edgeport: fix up switch fall-through comments Message-ID: <20190502173515.GA13801@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline User-Agent: Mutt/1.11.4 (2019-03-13) Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Message-ID: <20190502173515.Ozro_QoTruA6xSkhL98TdxbzExLXKWdVWxM0EmazdDY@z> 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 Signed-off-by: Greg Kroah-Hartman diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c index 4ca31c0e4174..48a439298a68 100644 --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c @@ -1751,7 +1751,7 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial, edge_serial->rxState = EXPECT_HDR2; break; } - /* otherwise, drop on through */ + /* Fall through */ case EXPECT_HDR2: edge_serial->rxHeader2 = *buffer; ++buffer; @@ -1790,29 +1790,20 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial, edge_serial->rxHeader2, 0); edge_serial->rxState = EXPECT_HDR1; break; - } else { - edge_serial->rxPort = - IOSP_GET_HDR_PORT(edge_serial->rxHeader1); - edge_serial->rxBytesRemaining = - IOSP_GET_HDR_DATA_LEN( - edge_serial->rxHeader1, - edge_serial->rxHeader2); - dev_dbg(dev, "%s - Data for Port %u Len %u\n", - __func__, - edge_serial->rxPort, - edge_serial->rxBytesRemaining); - - /* ASSERT(DevExt->RxPort < DevExt->NumPorts); - * ASSERT(DevExt->RxBytesRemaining < - * IOSP_MAX_DATA_LENGTH); - */ - - if (bufferLength == 0) { - edge_serial->rxState = EXPECT_DATA; - break; - } - /* Else, drop through */ } + + edge_serial->rxPort = IOSP_GET_HDR_PORT(edge_serial->rxHeader1); + edge_serial->rxBytesRemaining = IOSP_GET_HDR_DATA_LEN(edge_serial->rxHeader1, + edge_serial->rxHeader2); + dev_dbg(dev, "%s - Data for Port %u Len %u\n", __func__, + edge_serial->rxPort, + edge_serial->rxBytesRemaining); + + if (bufferLength == 0) { + edge_serial->rxState = EXPECT_DATA; + break; + } + /* Fall through */ case EXPECT_DATA: /* Expect data */ if (bufferLength < edge_serial->rxBytesRemaining) { rxLen = bufferLength;