scsi: Remove unneeded break statements

A break is not needed if it is preceded by a return or goto.

Link: https://lore.kernel.org/r/20201019142333.16584-1-trix@redhat.com
Signed-off-by: Tom Rix <trix@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c
index f923ed0..ed03419 100644 (file)
--- a/drivers/scsi/aic94xx/aic94xx_task.c
+++ b/drivers/scsi/aic94xx/aic94xx_task.c
@@ -269,7 +269,6 @@ Again:
        case TA_I_T_NEXUS_LOSS:
                opcode = dl->status_block[0];
                goto Again;
-               break;
        case TF_INV_CONN_HANDLE:
                ts->resp = SAS_TASK_UNDELIVERED;
                ts->stat = SAS_DEVICE_UNKNOWN;

diff --git a/drivers/scsi/be2iscsi/be_mgmt.c b/drivers/scsi/be2iscsi/be_mgmt.c
index 96d6e38..0d49285 100644 (file)
--- a/drivers/scsi/be2iscsi/be_mgmt.c
+++ b/drivers/scsi/be2iscsi/be_mgmt.c
@@ -1244,18 +1244,14 @@ beiscsi_adap_family_disp(struct device *dev, struct device_attribute *attr,
        case OC_DEVICE_ID2:
                return snprintf(buf, PAGE_SIZE,
                                "Obsolete/Unsupported BE2 Adapter Family\n");
-               break;
        case BE_DEVICE_ID2:
        case OC_DEVICE_ID3:
                return snprintf(buf, PAGE_SIZE, "BE3-R Adapter Family\n");
-               break;
        case OC_SKH_ID1:
                return snprintf(buf, PAGE_SIZE, "Skyhawk-R Adapter Family\n");
-               break;
        default:
                return snprintf(buf, PAGE_SIZE,
                                "Unknown Adapter Family: 0x%x\n", dev_id);
-               break;
        }
 }
 

diff --git a/drivers/scsi/bnx2fc/bnx2fc_hwi.c b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
index 0899209..b37b0a9 100644 (file)
--- a/drivers/scsi/bnx2fc/bnx2fc_hwi.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
@@ -770,7 +770,6 @@ static void bnx2fc_process_unsol_compl(struct bnx2fc_rport *tgt, u16 wqe)
                        } else
                                printk(KERN_ERR PFX "SRR in progress\n");
                        goto ret_err_rqe;
-                       break;
                default:
                        break;
                }

diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 0f92749..a4be6f4 100644 (file)
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -1894,7 +1894,6 @@ static int fcoe_device_notification(struct notifier_block *notifier,
                mutex_unlock(&fcoe_config_mutex);
                fcoe_ctlr_device_delete(fcoe_ctlr_to_ctlr_dev(ctlr));
                goto out;
-               break;
        case NETDEV_FEAT_CHANGE:
                fcoe_netdev_features_change(lport, netdev);
                break;

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 83ce4f1..45136e3 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -7442,7 +7442,6 @@ static int find_PCI_BAR_index(struct pci_dev *pdev, unsigned long pci_bar_addr)
                                dev_warn(&pdev->dev,
                                       "base address is invalid\n");
                                return -1;
-                               break;
                        }
                }
                if (offset == pci_bar_addr - PCI_BASE_ADDRESS_0)

diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c
index 6a2561f..db4c7a7 100644 (file)
--- a/drivers/scsi/hptiop.c
+++ b/drivers/scsi/hptiop.c
@@ -758,7 +758,6 @@ static void hptiop_finish_scsi_req(struct hptiop_hba *hba, u32 tag,
                scp->result = SAM_STAT_CHECK_CONDITION;
                memcpy(scp->sense_buffer, &req->sg_list, SCSI_SENSE_BUFFERSIZE);
                goto skip_resid;
-               break;
 
        default:
                scp->result = DRIVER_INVALID << 24 | DID_ABORT << 16;

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index b0aa58d..e451102 100644 (file)
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -9487,7 +9487,6 @@ static pci_ers_result_t ipr_pci_error_detected(struct pci_dev *pdev,
        case pci_channel_io_perm_failure:
                ipr_pci_perm_failure(pdev);
                return PCI_ERS_RESULT_DISCONNECT;
-               break;
        default:
                break;
        }

diff --git a/drivers/scsi/isci/phy.c b/drivers/scsi/isci/phy.c
index 7041e2e..1b87d90 100644 (file)
--- a/drivers/scsi/isci/phy.c
+++ b/drivers/scsi/isci/phy.c
@@ -753,7 +753,6 @@ enum sci_status sci_phy_event_handler(struct isci_phy *iphy, u32 event_code)
                default:
                        phy_event_warn(iphy, state, event_code);
                        return SCI_FAILURE;
-                       break;
                }
                return SCI_SUCCESS;
        case SCI_PHY_SUB_AWAIT_IAF_UF:
@@ -958,7 +957,6 @@ enum sci_status sci_phy_event_handler(struct isci_phy *iphy, u32 event_code)
                default:
                        phy_event_warn(iphy, state, event_code);
                        return SCI_FAILURE_INVALID_STATE;
-                       break;
                }
                return SCI_SUCCESS;
        default:

diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
index c9a327b..325081a 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -3341,7 +3341,6 @@ lpfc_idiag_pcicfg_read(struct file *file, char __user *buf, size_t nbytes,
                break;
        case LPFC_PCI_CFG_BROWSE: /* browse all */
                goto pcicfg_browse;
-               break;
        default:
                /* illegal count */
                len = 0;
@@ -4381,7 +4380,7 @@ lpfc_idiag_queacc_write(struct file *file, const char __user *buf,
                        }
                }
                goto error_out;
-               break;
+
        case LPFC_IDIAG_CQ:
                /* MBX complete queue */
                if (phba->sli4_hba.mbx_cq &&
@@ -4433,7 +4432,7 @@ lpfc_idiag_queacc_write(struct file *file, const char __user *buf,
                        }
                }
                goto error_out;
-               break;
+
        case LPFC_IDIAG_MQ:
                /* MBX work queue */
                if (phba->sli4_hba.mbx_wq &&
@@ -4447,7 +4446,7 @@ lpfc_idiag_queacc_write(struct file *file, const char __user *buf,
                        goto pass_check;
                }
                goto error_out;
-               break;
+
        case LPFC_IDIAG_WQ:
                /* ELS work queue */
                if (phba->sli4_hba.els_wq &&
@@ -4487,9 +4486,8 @@ lpfc_idiag_queacc_write(struct file *file, const char __user *buf,
                                }
                        }
                }
-
                goto error_out;
-               break;
+
        case LPFC_IDIAG_RQ:
                /* HDR queue */
                if (phba->sli4_hba.hdr_rq &&
@@ -4514,10 +4512,8 @@ lpfc_idiag_queacc_write(struct file *file, const char __user *buf,
                        goto pass_check;
                }
                goto error_out;
-               break;
        default:
                goto error_out;
-               break;
        }
 
 pass_check:

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index ca25e54..b609035 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -7196,7 +7196,6 @@ lpfc_init_api_table_setup(struct lpfc_hba *phba, uint8_t dev_grp)
                                "1431 Invalid HBA PCI-device group: 0x%x\n",
                                dev_grp);
                return -ENODEV;
-               break;
        }
        return 0;
 }

diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 983eeb0..c3b02da 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -4284,7 +4284,6 @@ lpfc_scsi_api_table_setup(struct lpfc_hba *phba, uint8_t dev_grp)
                                "1418 Invalid HBA PCI-device group: 0x%x\n",
                                dev_grp);
                return -ENODEV;
-               break;
        }
        phba->lpfc_rampdown_queue_depth = lpfc_rampdown_queue_depth;
        phba->lpfc_scsi_cmd_iocb_cmpl = lpfc_scsi_cmd_iocb_cmpl;

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index e158cd7..0f18f1b 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -9189,7 +9189,6 @@ lpfc_mbox_api_table_setup(struct lpfc_hba *phba, uint8_t dev_grp)
                                "1420 Invalid HBA PCI-device group: 0x%x\n",
                                dev_grp);
                return -ENODEV;
-               break;
        }
        return 0;
 }
@@ -10072,7 +10071,6 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,
                                "2014 Invalid command 0x%x\n",
                                iocbq->iocb.ulpCommand);
                return IOCB_ERROR;
-               break;
        }
 
        if (iocbq->iocb_flag & LPFC_IO_DIF_PASS)
@@ -10234,7 +10232,6 @@ lpfc_sli_api_table_setup(struct lpfc_hba *phba, uint8_t dev_grp)
                                "1419 Invalid HBA PCI-device group: 0x%x\n",
                                dev_grp);
                return -ENODEV;
-               break;
        }
        phba->lpfc_get_iocb_from_iocbq = lpfc_get_iocb_from_iocbq;
        return 0;

diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c
index 0354898..2f7a52b 100644 (file)
--- a/drivers/scsi/mvumi.c
+++ b/drivers/scsi/mvumi.c
@@ -2296,7 +2296,6 @@ static int mvumi_cfg_hw_reg(struct mvumi_hba *mhba)
                break;
        default:
                return -1;
-               break;
        }
 
        return 0;

diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index bc5a623..bb3b388 100644 (file)
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1102,8 +1102,6 @@ static irqreturn_t nspintr(int irq, void *dev_id)
                nsp_index_write(base, SCSIBUSCTRL, SCSI_ATN | AUTODIRECTION | ACKENB);
                return IRQ_HANDLED;
 
-               break;
-
        case PH_RESELECT:
                //nsp_dbg(NSP_DEBUG_INTR, "phase reselect");
                // *sync_neg = SYNC_NOT_YET;

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 07afd0d..40af7f1 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -4030,7 +4030,6 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
 
                        set_bit(N2N_LOGIN_NEEDED, &vha->dpc_flags);
                        return;
-                       break;
                case TOPO_FL:
                        ha->current_topology = ISP_CFG_FL;
                        break;

diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index e2e5356..43f7624 100644 (file)
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -2846,7 +2846,6 @@ static int st_int_ioctl(struct scsi_tape *STp, unsigned int cmd_in, unsigned lon
        case MTNOP:
                DEBC_printk(STp, "No op on tape.\n");
                return 0;       /* Should do something ? */
-               break;
        case MTRETEN:
                cmd[0] = START_STOP;
                if (STp->immediate) {

diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index a9fe092..255a2d4 100644 (file)
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -4596,7 +4596,6 @@ static void sym_int_sir(struct sym_hcb *np)
                                        scr_to_cpu(np->lastmsg), np->msgout[0]);
                        }
                        goto out_clrack;
-                       break;
                default:
                        goto out_reject;
                }