[PATCH 0/3] Fix fallthrough warnings.

mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed

* [PATCH 0/3] Fix fallthrough warnings.
@ 2019-08-29 12:31 Michal Suchanek
  2019-08-29 12:32 ` [PATCH 1/3] scsi: cxlflash: " Michal Suchanek
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Michal Suchanek @ 2019-08-29 12:31 UTC (permalink / raw)
  To: linuxppc-dev
  Cc: Michal Suchanek, Manoj N. Kumar, Matthew R. Ochs, Uma Krishnan,
	James E.J. Bottomley, Martin K. Petersen, Tyrel Datwyler,
	Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
	Michael Cyr, linux-scsi, linux-kernel, target-devel

Build with recent compiler results in numerous fallthrough warnings.

The code looks correct to me so just adding the comments to quiet gcc.

Please review if the fallthrough was really intentional.

Thanks

Michal

Michal Suchanek (3):
  scsi: cxlflash: Fix fallthrough warnings.
  scsi: ibmvfc: Fix fallthrough warnings.
  scsi: ibmvscsi: tgt: Fix fallthrough warnings.

 drivers/scsi/cxlflash/main.c             | 8 ++++++++
 drivers/scsi/ibmvscsi/ibmvfc.c           | 3 +++
 drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 3 +++
 3 files changed, 14 insertions(+)

-- 
2.12.3


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/3] scsi: cxlflash: Fix fallthrough warnings.
  2019-08-29 12:31 [PATCH 0/3] Fix fallthrough warnings Michal Suchanek
@ 2019-08-29 12:32 ` Michal Suchanek
  2019-08-29 21:30   ` Uma Krishnan
       [not found]   ` <21A3BB0F-98DB-4D64-AE93-9B8A8B6193B3@linux.ibm.com>
  2019-08-29 12:32 ` [PATCH 2/3] scsi: ibmvfc: " Michal Suchanek
  2019-08-29 12:32 ` [PATCH 3/3] scsi: ibmvscsi: tgt: " Michal Suchanek
  2 siblings, 2 replies; 6+ messages in thread
From: Michal Suchanek @ 2019-08-29 12:32 UTC (permalink / raw)
  To: linuxppc-dev
  Cc: Michal Suchanek, Manoj N. Kumar, Matthew R. Ochs, Uma Krishnan,
	James E.J. Bottomley, Martin K. Petersen, Benjamin Herrenschmidt,
	Paul Mackerras, Michael Ellerman, linux-scsi, linux-kernel

Add fallthrough comments where missing.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
 drivers/scsi/cxlflash/main.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c
index b1f4724efde2..f402fa9a7bec 100644
--- a/drivers/scsi/cxlflash/main.c
+++ b/drivers/scsi/cxlflash/main.c
@@ -753,10 +753,13 @@ static void term_intr(struct cxlflash_cfg *cfg, enum undo_level level,
 		/* SISL_MSI_ASYNC_ERROR is setup only for the primary HWQ */
 		if (index == PRIMARY_HWQ)
 			cfg->ops->unmap_afu_irq(hwq->ctx_cookie, 3, hwq);
+		/* fall through */
 	case UNMAP_TWO:
 		cfg->ops->unmap_afu_irq(hwq->ctx_cookie, 2, hwq);
+		/* fall through */
 	case UNMAP_ONE:
 		cfg->ops->unmap_afu_irq(hwq->ctx_cookie, 1, hwq);
+		/* fall through */
 	case FREE_IRQ:
 		cfg->ops->free_afu_irqs(hwq->ctx_cookie);
 		/* fall through */
@@ -973,14 +976,18 @@ static void cxlflash_remove(struct pci_dev *pdev)
 	switch (cfg->init_state) {
 	case INIT_STATE_CDEV:
 		cxlflash_release_chrdev(cfg);
+		/* fall through */
 	case INIT_STATE_SCSI:
 		cxlflash_term_local_luns(cfg);
 		scsi_remove_host(cfg->host);
+		/* fall through */
 	case INIT_STATE_AFU:
 		term_afu(cfg);
+		/* fall through */
 	case INIT_STATE_PCI:
 		cfg->ops->destroy_afu(cfg->afu_cookie);
 		pci_disable_device(pdev);
+		/* fall through */
 	case INIT_STATE_NONE:
 		free_mem(cfg);
 		scsi_host_put(cfg->host);
@@ -3017,6 +3024,7 @@ static ssize_t num_hwqs_store(struct device *dev,
 		wait_event(cfg->reset_waitq, cfg->state != STATE_RESET);
 		if (cfg->state == STATE_NORMAL)
 			goto retry;
+		/* fall through */
 	default:
 		/* Ideally should not happen */
 		dev_err(dev, "%s: Device is not ready, state=%d\n",
-- 
2.12.3


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/3] scsi: cxlflash: Fix fallthrough warnings.
  2019-08-29 12:32 ` [PATCH 1/3] scsi: cxlflash: " Michal Suchanek
@ 2019-08-29 21:30   ` Uma Krishnan
       [not found]   ` <21A3BB0F-98DB-4D64-AE93-9B8A8B6193B3@linux.ibm.com>
  1 sibling, 0 replies; 6+ messages in thread
From: Uma Krishnan @ 2019-08-29 21:30 UTC (permalink / raw)
  To: Michal Suchanek
  Cc: linuxppc-dev, Manoj N. Kumar, Matthew R. Ochs,
	James E.J. Bottomley, Martin K. Petersen, Benjamin Herrenschmidt,
	Paul Mackerras, Michael Ellerman, linux-scsi, linux-kernel

Below commit queued up for 5.4 includes these changes.

commit 657bd277c162580674ddb86a90c4aeb62639bff5
Author: Gustavo A. R. Silva <gustavo@embeddedor.com>
Date:   Sun Jul 28 19:21:19 2019 -0500

Thanks,
Uma Krishnan

> On Aug 29, 2019, at 7:32 AM, Michal Suchanek <msuchanek@suse.de> wrote:
> 
> Add fallthrough comments where missing.
> 
> Signed-off-by: Michal Suchanek <msuchanek@suse.de>
> ---
> drivers/scsi/cxlflash/main.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c
> index b1f4724efde2..f402fa9a7bec 100644
> --- a/drivers/scsi/cxlflash/main.c
> +++ b/drivers/scsi/cxlflash/main.c
> @@ -753,10 +753,13 @@ static void term_intr(struct cxlflash_cfg *cfg, enum undo_level level,
> 		/* SISL_MSI_ASYNC_ERROR is setup only for the primary HWQ */
> 		if (index == PRIMARY_HWQ)
> 			cfg->ops->unmap_afu_irq(hwq->ctx_cookie, 3, hwq);
> +		/* fall through */
> 	case UNMAP_TWO:
> 		cfg->ops->unmap_afu_irq(hwq->ctx_cookie, 2, hwq);
> +		/* fall through */
> 	case UNMAP_ONE:
> 		cfg->ops->unmap_afu_irq(hwq->ctx_cookie, 1, hwq);
> +		/* fall through */
> 	case FREE_IRQ:
> 		cfg->ops->free_afu_irqs(hwq->ctx_cookie);
> 		/* fall through */
> @@ -973,14 +976,18 @@ static void cxlflash_remove(struct pci_dev *pdev)
> 	switch (cfg->init_state) {
> 	case INIT_STATE_CDEV:
> 		cxlflash_release_chrdev(cfg);
> +		/* fall through */
> 	case INIT_STATE_SCSI:
> 		cxlflash_term_local_luns(cfg);
> 		scsi_remove_host(cfg->host);
> +		/* fall through */
> 	case INIT_STATE_AFU:
> 		term_afu(cfg);
> +		/* fall through */
> 	case INIT_STATE_PCI:
> 		cfg->ops->destroy_afu(cfg->afu_cookie);
> 		pci_disable_device(pdev);
> +		/* fall through */
> 	case INIT_STATE_NONE:
> 		free_mem(cfg);
> 		scsi_host_put(cfg->host);
> @@ -3017,6 +3024,7 @@ static ssize_t num_hwqs_store(struct device *dev,
> 		wait_event(cfg->reset_waitq, cfg->state != STATE_RESET);
> 		if (cfg->state == STATE_NORMAL)
> 			goto retry;
> +		/* fall through */
> 	default:
> 		/* Ideally should not happen */
> 		dev_err(dev, "%s: Device is not ready, state=%d\n",
> -- 
> 2.12.3
> 


^ permalink raw reply	[flat|nested] 6+ messages in thread

[parent not found: <21A3BB0F-98DB-4D64-AE93-9B8A8B6193B3@linux.ibm.com>]

* Re: [PATCH 1/3] scsi: cxlflash: Fix fallthrough warnings.
       [not found]   ` <21A3BB0F-98DB-4D64-AE93-9B8A8B6193B3@linux.ibm.com>
@ 2019-08-29 21:32     ` Michal Suchánek
  0 siblings, 0 replies; 6+ messages in thread
From: Michal Suchánek @ 2019-08-29 21:32 UTC (permalink / raw)
  To: Uma Krishnan
  Cc: linuxppc-dev, Manoj N. Kumar, Matthew R. Ochs,
	James E.J. Bottomley, Martin K. Petersen, Benjamin Herrenschmidt,
	Paul Mackerras, Michael Ellerman, linux-scsi, linux-kernel

On Thu, 29 Aug 2019 15:34:08 -0500
Uma Krishnan <ukrishn@linux.ibm.com> wrote:

> Below commit queued up for 5.4 includes these changes.
> 
> commit 657bd277c162580674ddb86a90c4aeb62639bff5
> Author: Gustavo A. R. Silva <gustavo@embeddedor.com>
> Date:   Sun Jul 28 19:21:19 2019 -0500
> 
> Thanks,
> Uma Krishnan

Works for me as well.

Thanks

Michal

> 
> On Aug 29, 2019, at 7:32 AM, Michal Suchanek <msuchanek@suse.de> wrote:
> > 
> > Add fallthrough comments where missing.
> > 
> > Signed-off-by: Michal Suchanek <msuchanek@suse.de>
> > ---
> > drivers/scsi/cxlflash/main.c | 8 ++++++++
> > 1 file changed, 8 insertions(+)
> > 
> > diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c
> > index b1f4724efde2..f402fa9a7bec 100644
> > --- a/drivers/scsi/cxlflash/main.c
> > +++ b/drivers/scsi/cxlflash/main.c
> > @@ -753,10 +753,13 @@ static void term_intr(struct cxlflash_cfg *cfg, enum undo_level level,
> > /* SISL_MSI_ASYNC_ERROR is setup only for the primary HWQ */
> > if (index == PRIMARY_HWQ)
> > cfg->ops->unmap_afu_irq(hwq->ctx_cookie, 3, hwq);
> > + /* fall through */
> > case UNMAP_TWO:
> > cfg->ops->unmap_afu_irq(hwq->ctx_cookie, 2, hwq);
> > + /* fall through */
> > case UNMAP_ONE:
> > cfg->ops->unmap_afu_irq(hwq->ctx_cookie, 1, hwq);
> > + /* fall through */
> > case FREE_IRQ:
> > cfg->ops->free_afu_irqs(hwq->ctx_cookie);
> > /* fall through */
> > @@ -973,14 +976,18 @@ static void cxlflash_remove(struct pci_dev *pdev)
> > switch (cfg->init_state) {
> > case INIT_STATE_CDEV:
> > cxlflash_release_chrdev(cfg);
> > + /* fall through */
> > case INIT_STATE_SCSI:
> > cxlflash_term_local_luns(cfg);
> > scsi_remove_host(cfg->host);
> > + /* fall through */
> > case INIT_STATE_AFU:
> > term_afu(cfg);
> > + /* fall through */
> > case INIT_STATE_PCI:
> > cfg->ops->destroy_afu(cfg->afu_cookie);
> > pci_disable_device(pdev);
> > + /* fall through */
> > case INIT_STATE_NONE:
> > free_mem(cfg);
> > scsi_host_put(cfg->host);
> > @@ -3017,6 +3024,7 @@ static ssize_t num_hwqs_store(struct device *dev,
> > wait_event(cfg->reset_waitq, cfg->state != STATE_RESET);
> > if (cfg->state == STATE_NORMAL)
> > goto retry;
> > + /* fall through */
> > default:
> > /* Ideally should not happen */
> > dev_err(dev, "%s: Device is not ready, state=%d\n",
> > --
> > 2.12.3
> > 
> > 
> 


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 2/3] scsi: ibmvfc: Fix fallthrough warnings.
  2019-08-29 12:31 [PATCH 0/3] Fix fallthrough warnings Michal Suchanek
  2019-08-29 12:32 ` [PATCH 1/3] scsi: cxlflash: " Michal Suchanek
@ 2019-08-29 12:32 ` Michal Suchanek
  2019-08-29 12:32 ` [PATCH 3/3] scsi: ibmvscsi: tgt: " Michal Suchanek
  2 siblings, 0 replies; 6+ messages in thread
From: Michal Suchanek @ 2019-08-29 12:32 UTC (permalink / raw)
  To: linuxppc-dev
  Cc: Michal Suchanek, James E.J. Bottomley, Martin K. Petersen,
	Tyrel Datwyler, Benjamin Herrenschmidt, Paul Mackerras,
	Michael Ellerman, linux-scsi, linux-kernel

Add fallthrough comments where they are missing.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
 drivers/scsi/ibmvscsi/ibmvfc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 8cdbac076a1b..2a06a5b4d3a5 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -1830,6 +1830,7 @@ static int ibmvfc_bsg_request(struct bsg_job *job)
 		port_id = (bsg_request->rqst_data.h_els.port_id[0] << 16) |
 			(bsg_request->rqst_data.h_els.port_id[1] << 8) |
 			bsg_request->rqst_data.h_els.port_id[2];
+		/* fallthrough */
 	case FC_BSG_RPT_ELS:
 		fc_flags = IBMVFC_FC_ELS;
 		break;
@@ -1838,6 +1839,7 @@ static int ibmvfc_bsg_request(struct bsg_job *job)
 		port_id = (bsg_request->rqst_data.h_ct.port_id[0] << 16) |
 			(bsg_request->rqst_data.h_ct.port_id[1] << 8) |
 			bsg_request->rqst_data.h_ct.port_id[2];
+		/* fallthrough */
 	case FC_BSG_RPT_CT:
 		fc_flags = IBMVFC_FC_CT_IU;
 		break;
@@ -4020,6 +4022,7 @@ static void ibmvfc_npiv_login_done(struct ibmvfc_event *evt)
 		return;
 	case IBMVFC_MAD_CRQ_ERROR:
 		ibmvfc_retry_host_init(vhost);
+		/* fallthrough */
 	case IBMVFC_MAD_DRIVER_FAILED:
 		ibmvfc_free_event(evt);
 		return;
-- 
2.12.3


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 3/3] scsi: ibmvscsi: tgt: Fix fallthrough warnings.
  2019-08-29 12:31 [PATCH 0/3] Fix fallthrough warnings Michal Suchanek
  2019-08-29 12:32 ` [PATCH 1/3] scsi: cxlflash: " Michal Suchanek
  2019-08-29 12:32 ` [PATCH 2/3] scsi: ibmvfc: " Michal Suchanek
@ 2019-08-29 12:32 ` Michal Suchanek
  2 siblings, 0 replies; 6+ messages in thread
From: Michal Suchanek @ 2019-08-29 12:32 UTC (permalink / raw)
  To: linuxppc-dev
  Cc: Michal Suchanek, James E.J. Bottomley, Martin K. Petersen,
	Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
	Michael Cyr, linux-scsi, linux-kernel, target-devel

Add fallthrough comments where they are missing.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
 drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
index 7f9535392a93..57475dbcae0f 100644
--- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
+++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
@@ -1581,6 +1581,7 @@ static long ibmvscsis_adapter_info(struct scsi_info *vscsi,
 	case H_PERMISSION:
 		if (connection_broken(vscsi))
 			flag_bits = (RESPONSE_Q_DOWN | CLIENT_FAILED);
+		/* fallthrough */
 	default:
 		dev_err(&vscsi->dev, "adapter_info: h_copy_rdma to client failed, rc %ld\n",
 			rc);
@@ -2492,8 +2493,10 @@ static long ibmvscsis_ping_response(struct scsi_info *vscsi)
 		break;
 	case H_CLOSED:
 		vscsi->flags |= CLIENT_FAILED;
+		/* fallthrough */
 	case H_DROPPED:
 		vscsi->flags |= RESPONSE_Q_DOWN;
+		/* fallthrough */
 	case H_REMOTE_PARM:
 		dev_err(&vscsi->dev, "ping_response: h_send_crq failed, rc %ld\n",
 			rc);
-- 
2.12.3


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2019-08-29 21:32 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-29 12:31 [PATCH 0/3] Fix fallthrough warnings Michal Suchanek
2019-08-29 12:32 ` [PATCH 1/3] scsi: cxlflash: " Michal Suchanek
2019-08-29 21:30   ` Uma Krishnan
     [not found]   ` <21A3BB0F-98DB-4D64-AE93-9B8A8B6193B3@linux.ibm.com>
2019-08-29 21:32     ` Michal Suchánek
2019-08-29 12:32 ` [PATCH 2/3] scsi: ibmvfc: " Michal Suchanek
2019-08-29 12:32 ` [PATCH 3/3] scsi: ibmvscsi: tgt: " Michal Suchanek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome