From: lijian <lijian@xxxxxxxxxx> Removed unnecessary 'return'. Signed-off-by: lijian <lijian@xxxxxxxxxx> --- drivers/scsi/lpfc/lpfc_init.c | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index f6c26342ad69..932c6bdb8c40 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -288,7 +288,6 @@ lpfc_config_async_cmpl(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq) else phba->temp_sensor_support = 0; mempool_free(pmboxq, phba->mbox_mem_pool); - return; } /** @@ -332,7 +331,6 @@ lpfc_dump_wakeup_param_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq) prg->ver, prg->rev, prg->lev, dist, prg->num); mempool_free(pmboxq, phba->mbox_mem_pool); - return; } /** @@ -1149,7 +1147,6 @@ lpfc_hb_timeout(struct timer_list *t) /* Tell the worker thread there is work to do */ if (!tmo_posted) lpfc_worker_wake_up(phba); - return; } /** @@ -1215,7 +1212,6 @@ lpfc_hb_mbox_cmpl(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq) mod_timer(&phba->hb_tmofunc, jiffies + msecs_to_jiffies(1000 * LPFC_HB_MBOX_INTERVAL)); - return; } /* @@ -1589,7 +1585,6 @@ lpfc_offline_eratt(struct lpfc_hba *phba) lpfc_sli_brdready(phba, HS_MBRDY); lpfc_unblock_mgmt_io(phba); phba->link_state = LPFC_HBA_ERROR; - return; } /** @@ -1831,7 +1826,6 @@ lpfc_handle_eratt_s3(struct lpfc_hba *phba) lpfc_offline_eratt(phba); } - return; } /** @@ -2192,8 +2186,6 @@ lpfc_handle_latt(struct lpfc_hba *phba) lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT, "0300 LATT: Cannot issue READ_LA: Data:%d\n", rc); - - return; } /** @@ -2958,7 +2950,6 @@ lpfc_stop_vport_timers(struct lpfc_vport *vport) del_timer_sync(&vport->els_tmofunc); del_timer_sync(&vport->delayed_disc_tmo); lpfc_can_disctmo(vport); - return; } /** @@ -3041,7 +3032,6 @@ lpfc_stop_hba_timers(struct lpfc_hba *phba) phba->pci_dev_grp); break; } - return; } /** @@ -4517,7 +4507,6 @@ destroy_port(struct lpfc_vport *vport) spin_unlock_irq(&phba->port_list_lock); lpfc_cleanup(vport); - return; } /** @@ -6132,7 +6121,6 @@ static void lpfc_log_intr_mode(struct lpfc_hba *phba, uint32_t intr_mode) "0482 Illegal interrupt mode.\n"); break; } - return; } /** @@ -6201,8 +6189,6 @@ lpfc_disable_pci_dev(struct lpfc_hba *phba) /* Release PCI resource and disable PCI device */ pci_release_mem_regions(pdev); pci_disable_device(pdev); - - return; } /** @@ -6548,8 +6534,6 @@ lpfc_sli_driver_resource_unset(struct lpfc_hba *phba) { /* Free device driver memory allocated */ lpfc_mem_free_all(phba); - - return; } /** @@ -7159,8 +7143,6 @@ lpfc_sli4_driver_resource_unset(struct lpfc_hba *phba) list_del_init(&conn_entry->list); kfree(conn_entry); } - - return; } /** @@ -7267,8 +7249,6 @@ lpfc_free_iocb_list(struct lpfc_hba *phba) phba->total_iocbq_bufs--; } spin_unlock_irq(&phba->hbalock); - - return; } /** @@ -7678,7 +7658,6 @@ lpfc_hba_free(struct lpfc_hba *phba) phba->sli.sli3_ring = NULL; kfree(phba); - return; } /** @@ -7756,8 +7735,6 @@ lpfc_destroy_shost(struct lpfc_hba *phba) /* Destroy physical port that associated with the SCSI host */ destroy_port(vport); - - return; } /** @@ -7852,7 +7829,6 @@ lpfc_post_init_setup(struct lpfc_hba *phba) sizeof(adapter_event), (char *) &adapter_event, LPFC_NL_VENDOR_ID); - return; } /** @@ -7990,8 +7966,6 @@ lpfc_sli_pci_mem_unset(struct lpfc_hba *phba) /* I/O memory unmap */ iounmap(phba->ctrl_regs_memmap_p); iounmap(phba->slim_memmap_p); - - return; } /** @@ -11236,7 +11210,6 @@ lpfc_cpu_affinity_check(struct lpfc_hba *phba, int vectors) /* The cpu_map array will be used later during initialization * when EQ / CQ / WQs are allocated and configured. */ - return; } /** @@ -11853,8 +11826,6 @@ lpfc_unset_hba(struct lpfc_hba *phba) lpfc_sli_brdrestart(phba); lpfc_sli_disable_intr(phba); - - return; } /** @@ -13340,8 +13311,6 @@ lpfc_pci_remove_one_s4(struct pci_dev *pdev) /* Finally, free the driver's device data structure */ lpfc_hba_free(phba); - - return; } /** @@ -13725,7 +13694,6 @@ lpfc_pci_remove_one(struct pci_dev *pdev) phba->pci_dev_grp); break; } - return; } /** @@ -13904,7 +13872,6 @@ lpfc_io_resume(struct pci_dev *pdev) phba->pci_dev_grp); break; } - return; } /** @@ -13931,8 +13898,6 @@ lpfc_sli4_oas_verify(struct lpfc_hba *phba) mempool_destroy(phba->device_data_mem_pool); phba->device_data_mem_pool = NULL; } - - return; } /** -- 2.25.1