Message ID | 279d33f05007e9f3e3fb4e6ea19634b2608ffbd3.1567081143.git.msuchanek@suse.de (mailing list archive) |
---|---|
State | Rejected |
Headers | show |
Series | Fix fallthrough warnings. | expand |
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 >
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 > > > > >
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",
Add fallthrough comments where missing. Signed-off-by: Michal Suchanek <msuchanek@suse.de> --- drivers/scsi/cxlflash/main.c | 8 ++++++++ 1 file changed, 8 insertions(+)