| Message ID | 20190124180724.20910-2-malat@debian.org |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | [1/2] Bluetooth: Annotate implicit fall through in l2cap_config_rsp | expand |
On Thu, Jan 24, 2019 at 7:07 PM Mathieu Malaterre <malat@debian.org> wrote: > > There is a plan to build the kernel with -Wimplicit-fallthrough and > this place in the code produced a warning (W=1). > > In this particular case put the fall through comment on a separate line so > as to match the regular expression expected by GCC. > > This commit removes the following warning: > > net/bluetooth/rfcomm/core.c:479:6: warning: this statement may fall through [-Wimplicit-fallthrough=] Please discard, already fixed by : 6317950c1b9c Bluetooth: Mark expected switch fall-throughs > Cc: Peter Hurley <peter@hurleysoftware.com> > Signed-off-by: Mathieu Malaterre <malat@debian.org> > --- > net/bluetooth/rfcomm/core.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c > index 1a635df80643..caaae6accafa 100644 > --- a/net/bluetooth/rfcomm/core.c > +++ b/net/bluetooth/rfcomm/core.c > @@ -480,9 +480,8 @@ static int __rfcomm_dlc_close(struct rfcomm_dlc *d, int err) > __rfcomm_dlc_disconn(d); > break; > } > - /* if closing a dlc in a session that hasn't been started, > - * just close and unlink the dlc > - */ > + /* fall through - if closing a dlc in a session that hasn't */ > + /* been started, just close and unlink the dlc */ > > default: > rfcomm_dlc_clear_timer(d); > -- > 2.19.2 >
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index 1a635df80643..caaae6accafa 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -480,9 +480,8 @@ static int __rfcomm_dlc_close(struct rfcomm_dlc *d, int err) __rfcomm_dlc_disconn(d); break; } - /* if closing a dlc in a session that hasn't been started, - * just close and unlink the dlc - */ + /* fall through - if closing a dlc in a session that hasn't */ + /* been started, just close and unlink the dlc */ default: rfcomm_dlc_clear_timer(d);
There is a plan to build the kernel with -Wimplicit-fallthrough and this place in the code produced a warning (W=1). In this particular case put the fall through comment on a separate line so as to match the regular expression expected by GCC. This commit removes the following warning: net/bluetooth/rfcomm/core.c:479:6: warning: this statement may fall through [-Wimplicit-fallthrough=] Cc: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Mathieu Malaterre <malat@debian.org> --- net/bluetooth/rfcomm/core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)