| Message ID | 20190212173902.GA6829@embeddedor (mailing list archive) |
|---|---|
| State | Deferred |
| Delegated to: | Samuel Ortiz |
| Headers | show |
| Series | NFC: st21nfca: Fix a couple of fall-through warnings | expand |
Hi all, If no one cares, I'll add this to my tree for 5.2 Thanks -- Gustavo On 2/12/19 11:39 AM, Gustavo A. R. Silva wrote: > In preparation to enabling -Wimplicit-fallthrough, mark switch > cases where we are expecting to fall through. > > This patch fixes the following warnings by adding a missing break > and a fall-through annotation: > > drivers/nfc/st21nfca/dep.c: In function ‘st21nfca_tm_event_send_data’: > drivers/nfc/st21nfca/dep.c:391:3: warning: this statement may fall through [-Wimplicit-fallthrough=] > switch (cmd1) { > ^~~~~~ > drivers/nfc/st21nfca/dep.c:404:2: note: here > default: > ^~~~~~~ > In file included from ./include/linux/kernel.h:15, > from ./include/linux/skbuff.h:17, > from ./include/net/nfc/hci.h:21, > from drivers/nfc/st21nfca/dep.c:17: > drivers/nfc/st21nfca/dep.c: In function ‘st21nfca_im_recv_dep_res_cb’: > ./include/linux/printk.h:303:2: warning: this statement may fall through [-Wimplicit-fallthrough=] > printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__) > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/nfc/st21nfca/dep.c:622:4: note: in expansion of macro ‘pr_err’ > pr_err("Received a ACK/NACK PDU\n"); > ^~~~~~ > drivers/nfc/st21nfca/dep.c:623:3: note: here > case ST21NFCA_NFC_DEP_PFB_I_PDU: > ^~~~ > > Warning level 3 was used: -Wimplicit-fallthrough=3 > > This patch is part of the ongoing efforts to enable > -Wimplicit-fallthrough. > > Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> > --- > drivers/nfc/st21nfca/dep.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/nfc/st21nfca/dep.c b/drivers/nfc/st21nfca/dep.c > index 3420c5104c94..60f013063f80 100644 > --- a/drivers/nfc/st21nfca/dep.c > +++ b/drivers/nfc/st21nfca/dep.c > @@ -401,6 +401,7 @@ static int st21nfca_tm_event_send_data(struct nfc_hci_dev *hdev, > default: > return 1; > } > + break; > default: > return 1; > } > @@ -620,6 +621,7 @@ static void st21nfca_im_recv_dep_res_cb(void *context, struct sk_buff *skb, > switch (ST21NFCA_NFC_DEP_PFB_TYPE(dep_res->pfb)) { > case ST21NFCA_NFC_DEP_PFB_ACK_NACK_PDU: > pr_err("Received a ACK/NACK PDU\n"); > + /* fall through */ > case ST21NFCA_NFC_DEP_PFB_I_PDU: > info->dep_info.curr_nfc_dep_pni = > ST21NFCA_NFC_DEP_PFB_PNI(dep_res->pfb + 1); >
On Tue, Feb 12, 2019 at 9:39 AM Gustavo A. R. Silva <gustavo@embeddedor.com> wrote: > > In preparation to enabling -Wimplicit-fallthrough, mark switch > cases where we are expecting to fall through. > > This patch fixes the following warnings by adding a missing break > and a fall-through annotation: > > drivers/nfc/st21nfca/dep.c: In function ‘st21nfca_tm_event_send_data’: > drivers/nfc/st21nfca/dep.c:391:3: warning: this statement may fall through [-Wimplicit-fallthrough=] > switch (cmd1) { > ^~~~~~ > drivers/nfc/st21nfca/dep.c:404:2: note: here > default: > ^~~~~~~ > In file included from ./include/linux/kernel.h:15, > from ./include/linux/skbuff.h:17, > from ./include/net/nfc/hci.h:21, > from drivers/nfc/st21nfca/dep.c:17: > drivers/nfc/st21nfca/dep.c: In function ‘st21nfca_im_recv_dep_res_cb’: > ./include/linux/printk.h:303:2: warning: this statement may fall through [-Wimplicit-fallthrough=] > printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__) > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/nfc/st21nfca/dep.c:622:4: note: in expansion of macro ‘pr_err’ > pr_err("Received a ACK/NACK PDU\n"); > ^~~~~~ > drivers/nfc/st21nfca/dep.c:623:3: note: here > case ST21NFCA_NFC_DEP_PFB_I_PDU: > ^~~~ > > Warning level 3 was used: -Wimplicit-fallthrough=3 > > This patch is part of the ongoing efforts to enable > -Wimplicit-fallthrough. > > Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Reviewed-by: Kees Cook <keescook@chromium.org>
diff --git a/drivers/nfc/st21nfca/dep.c b/drivers/nfc/st21nfca/dep.c index 3420c5104c94..60f013063f80 100644 --- a/drivers/nfc/st21nfca/dep.c +++ b/drivers/nfc/st21nfca/dep.c @@ -401,6 +401,7 @@ static int st21nfca_tm_event_send_data(struct nfc_hci_dev *hdev, default: return 1; } + break; default: return 1; } @@ -620,6 +621,7 @@ static void st21nfca_im_recv_dep_res_cb(void *context, struct sk_buff *skb, switch (ST21NFCA_NFC_DEP_PFB_TYPE(dep_res->pfb)) { case ST21NFCA_NFC_DEP_PFB_ACK_NACK_PDU: pr_err("Received a ACK/NACK PDU\n"); + /* fall through */ case ST21NFCA_NFC_DEP_PFB_I_PDU: info->dep_info.curr_nfc_dep_pni = ST21NFCA_NFC_DEP_PFB_PNI(dep_res->pfb + 1);
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through. This patch fixes the following warnings by adding a missing break and a fall-through annotation: drivers/nfc/st21nfca/dep.c: In function ‘st21nfca_tm_event_send_data’: drivers/nfc/st21nfca/dep.c:391:3: warning: this statement may fall through [-Wimplicit-fallthrough=] switch (cmd1) { ^~~~~~ drivers/nfc/st21nfca/dep.c:404:2: note: here default: ^~~~~~~ In file included from ./include/linux/kernel.h:15, from ./include/linux/skbuff.h:17, from ./include/net/nfc/hci.h:21, from drivers/nfc/st21nfca/dep.c:17: drivers/nfc/st21nfca/dep.c: In function ‘st21nfca_im_recv_dep_res_cb’: ./include/linux/printk.h:303:2: warning: this statement may fall through [-Wimplicit-fallthrough=] printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/nfc/st21nfca/dep.c:622:4: note: in expansion of macro ‘pr_err’ pr_err("Received a ACK/NACK PDU\n"); ^~~~~~ drivers/nfc/st21nfca/dep.c:623:3: note: here case ST21NFCA_NFC_DEP_PFB_I_PDU: ^~~~ Warning level 3 was used: -Wimplicit-fallthrough=3 This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough. Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> --- drivers/nfc/st21nfca/dep.c | 2 ++ 1 file changed, 2 insertions(+)