redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

scsi: hisi_sas: Reduce some indirection in v3 hw driver

Browse source 
Sometimes local functions are called indirectly from the hw driver, which
only makes the code harder to follow. Remove these.

Method .hw_init is only called from platform driver probe, which is not
relevant, so don't set this either.

Link: https://lore.kernel.org/r/1606207594-196362-2-git-send-email-john.garry@huawei.com
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
John Garry 2020-11-24 16:46:32 +08:00 committed by Martin K. Petersen
parent c6131854e2
commit bec99e5250
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
View file

@ -3142,7 +3142,6 @@ static struct scsi_host_template sht_v3_hw = {
}; };
static const struct hisi_sas_hw hisi_sas_v3_hw = { static const struct hisi_sas_hw hisi_sas_v3_hw = {
.hw_init = hisi_sas_v3_init,
.setup_itct = setup_itct_v3_hw, .setup_itct = setup_itct_v3_hw,
.get_wideport_bitmap = get_wideport_bitmap_v3_hw, .get_wideport_bitmap = get_wideport_bitmap_v3_hw,
.complete_hdr_size = sizeof(struct hisi_sas_complete_v3_hdr), .complete_hdr_size = sizeof(struct hisi_sas_complete_v3_hdr),
@ -3322,7 +3321,7 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id)
if (rc) if (rc)
goto err_out_register_ha; goto err_out_register_ha;
rc = hisi_hba->hw->hw_init(hisi_hba); rc = hisi_sas_v3_init(hisi_hba);
if (rc) if (rc)
goto err_out_register_ha; goto err_out_register_ha;
@ -3495,7 +3494,7 @@ static int _resume_v3_hw(struct device *device)
scsi_remove_host(shost); scsi_remove_host(shost);
return rc; return rc;
} }
hisi_hba->hw->phys_init(hisi_hba); phys_init_v3_hw(hisi_hba);
sas_resume_ha(sha); sas_resume_ha(sha);
clear_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags); clear_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags);