Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5df41af4 authored by Xiang Chen's avatar Xiang Chen Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: delete timer when removing hisi_sas driver 



Delete timer for v1 and v3 hw when removing hisi_sas driver.

Signed-off-by: default avatarXiang chen <chenxiang66@hisilicon.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 61573630

drivers/scsi/hisi_sas/hisi_sas_main.c

+3 −0
Original line number Diff line number Diff line
@@ -2177,6 +2177,9 @@ int hisi_sas_remove(struct platform_device *pdev) 
	struct hisi_hba *hisi_hba = sha->lldd_ha;

	struct Scsi_Host *shost = sha->core.shost;



	if (timer_pending(&hisi_hba->timer))

		del_timer(&hisi_hba->timer);



	sas_unregister_ha(sha);

	sas_remove_host(sha->core.shost);

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+0 −3
Original line number Diff line number Diff line
@@ -3599,9 +3599,6 @@ static int hisi_sas_v2_remove(struct platform_device *pdev) 
	struct sas_ha_struct *sha = platform_get_drvdata(pdev);

	struct hisi_hba *hisi_hba = sha->lldd_ha;



	if (timer_pending(&hisi_hba->timer))

		del_timer(&hisi_hba->timer);



	hisi_sas_kill_tasklets(hisi_hba);



	return hisi_sas_remove(pdev);

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+3 −0
Original line number Diff line number Diff line
@@ -2183,6 +2183,9 @@ static void hisi_sas_v3_remove(struct pci_dev *pdev) 
	struct hisi_hba *hisi_hba = sha->lldd_ha;

	struct Scsi_Host *shost = sha->core.shost;



	if (timer_pending(&hisi_hba->timer))

		del_timer(&hisi_hba->timer);



	sas_unregister_ha(sha);

	sas_remove_host(sha->core.shost);