Commit 25882c82 authored by John Garry's avatar John Garry Committed by Martin K. Petersen
Browse files

scsi: libsas: Delete lldd_clear_aca callback 

This callback is never called, so remove support.

Link: https://lore.kernel.org/r/1645112566-115804-4-git-send-email-john.garry@huawei.com


Tested-by: default avatarYihang Li <liyihang6@hisilicon.com>
Tested-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: default avatarJack Wang <jinpu.wang@ionos.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-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 1d6049a3

Documentation/scsi/libsas.rst

+0 −2
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ Management Functions (TMFs) described in SAM:: 
	/* Task Management Functions. Must be called from process context. */

	int (*lldd_abort_task)(struct sas_task *);

	int (*lldd_abort_task_set)(struct domain_device *, u8 *lun);

	int (*lldd_clear_aca)(struct domain_device *, u8 *lun);

	int (*lldd_clear_task_set)(struct domain_device *, u8 *lun);

	int (*lldd_I_T_nexus_reset)(struct domain_device *);

	int (*lldd_lu_reset)(struct domain_device *, u8 *lun);
@@ -262,7 +261,6 @@ can look like this (called last thing from probe()) 


	    my_ha->sas_ha.lldd_abort_task     = my_abort_task;

	    my_ha->sas_ha.lldd_abort_task_set = my_abort_task_set;

	    my_ha->sas_ha.lldd_clear_aca      = my_clear_aca;

	    my_ha->sas_ha.lldd_clear_task_set = my_clear_task_set;

	    my_ha->sas_ha.lldd_I_T_nexus_reset= NULL; (2)

	    my_ha->sas_ha.lldd_lu_reset       = my_lu_reset;

drivers/scsi/aic94xx/aic94xx.h

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ void asd_set_dmamode(struct domain_device *dev); 
/* ---------- TMFs ---------- */

int  asd_abort_task(struct sas_task *);

int  asd_abort_task_set(struct domain_device *, u8 *lun);

int  asd_clear_aca(struct domain_device *, u8 *lun);

int  asd_clear_task_set(struct domain_device *, u8 *lun);

int  asd_lu_reset(struct domain_device *, u8 *lun);

int  asd_I_T_nexus_reset(struct domain_device *dev);

drivers/scsi/aic94xx/aic94xx_init.c

+0 −1
Original line number Diff line number Diff line
@@ -960,7 +960,6 @@ static struct sas_domain_function_template aic94xx_transport_functions = { 


	.lldd_abort_task	= asd_abort_task,

	.lldd_abort_task_set	= asd_abort_task_set,

	.lldd_clear_aca		= asd_clear_aca,

	.lldd_clear_task_set	= asd_clear_task_set,

	.lldd_I_T_nexus_reset	= asd_I_T_nexus_reset,

	.lldd_lu_reset		= asd_lu_reset,

drivers/scsi/aic94xx/aic94xx_tmf.c

+0 −9
Original line number Diff line number Diff line
@@ -644,15 +644,6 @@ int asd_abort_task_set(struct domain_device *dev, u8 *lun) 
	return res;

}



int asd_clear_aca(struct domain_device *dev, u8 *lun)

{

	int res = asd_initiate_ssp_tmf(dev, lun, TMF_CLEAR_ACA, 0);



	if (res == TMF_RESP_FUNC_COMPLETE)

		asd_clear_nexus_I_T_L(dev, lun);

	return res;

}



int asd_clear_task_set(struct domain_device *dev, u8 *lun)

{

	int res = asd_initiate_ssp_tmf(dev, lun, TMF_CLEAR_TASK_SET, 0);

drivers/scsi/hisi_sas/hisi_sas_main.c

+0 −12
Original line number Diff line number Diff line
@@ -1793,17 +1793,6 @@ static int hisi_sas_abort_task_set(struct domain_device *device, u8 *lun) 
	return rc;

}



static int hisi_sas_clear_aca(struct domain_device *device, u8 *lun)

{

	struct hisi_sas_tmf_task tmf_task;

	int rc;



	tmf_task.tmf = TMF_CLEAR_ACA;

	rc = hisi_sas_debug_issue_ssp_tmf(device, lun, &tmf_task);



	return rc;

}



#define I_T_NEXUS_RESET_PHYUP_TIMEOUT  (2 * HZ)



static int hisi_sas_debug_I_T_nexus_reset(struct domain_device *device)
@@ -2333,7 +2322,6 @@ static struct sas_domain_function_template hisi_sas_transport_ops = { 
	.lldd_control_phy	= hisi_sas_control_phy,

	.lldd_abort_task	= hisi_sas_abort_task,

	.lldd_abort_task_set	= hisi_sas_abort_task_set,

	.lldd_clear_aca		= hisi_sas_clear_aca,

	.lldd_I_T_nexus_reset	= hisi_sas_I_T_nexus_reset,

	.lldd_lu_reset		= hisi_sas_lu_reset,

	.lldd_query_task	= hisi_sas_query_task,