scsi: libsas: Delete lldd_clear_aca callback

[ Upstream commit 25882c82f850e3e972a973e0af310b3e58de38fd ]

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: Yihang Li <liyihang6@hisilicon.com>
Tested-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: Jack Wang <jinpu.wang@ionos.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Xiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Stable-dep-of: 8aa580cd9284 ("scsi: hisi_sas: Enable force phy when SATA disk directly connected")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/Documentation/scsi/libsas.rst b/Documentation/scsi/libsas.rst
index 6589dfefbc02ad24d1f87e7f9906e427e29faef0..305a253d5c3b0dbbb2e88c0d975e49ebe72fe02a 100644 (file)
--- a/Documentation/scsi/libsas.rst
+++ b/Documentation/scsi/libsas.rst
@@ -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;

diff --git a/drivers/scsi/aic94xx/aic94xx.h b/drivers/scsi/aic94xx/aic94xx.h
index 8f24180646c27224da3e42e362cdf46055510ae3..f595bc2ee45e7d9927d6c5d3270cfc634fcb6793 100644 (file)
--- a/drivers/scsi/aic94xx/aic94xx.h
+++ b/drivers/scsi/aic94xx/aic94xx.h
@@ -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);

diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
index 7a78606598c4bfc42184291b88bdd742ea32044b..954d0c5ae2e2865e4c0cfbe460d5f0b7f62903a9 100644 (file)
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -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,

diff --git a/drivers/scsi/aic94xx/aic94xx_tmf.c b/drivers/scsi/aic94xx/aic94xx_tmf.c
index 0eb6e206a2b48f2ddf0c1169963fcc9c9f085cb2..0ff0d6506ccf26217ac7185afe0ca157e4e78a2f 100644 (file)
--- a/drivers/scsi/aic94xx/aic94xx_tmf.c
+++ b/drivers/scsi/aic94xx/aic94xx_tmf.c
@@ -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);

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 9663492e566d13e903a741ab7ce9c06ff5de3ef3..bb95153bd22f08629483eb96bacccb542336055b 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -1753,17 +1753,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)
@@ -2275,7 +2264,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,

diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
index ffd33e5decae8b11b4d23b322b652a0b6c711573..bd73f6925a9dca8dde339f79e3baae3c80f6dfbb 100644 (file)
--- a/drivers/scsi/isci/init.c
+++ b/drivers/scsi/isci/init.c
@@ -191,7 +191,6 @@ static struct sas_domain_function_template isci_transport_ops  = {
        /* Task Management Functions. Must be called from process context. */
        .lldd_abort_task        = isci_task_abort_task,
        .lldd_abort_task_set    = isci_task_abort_task_set,
-       .lldd_clear_aca         = isci_task_clear_aca,
        .lldd_clear_task_set    = isci_task_clear_task_set,
        .lldd_I_T_nexus_reset   = isci_task_I_T_nexus_reset,
        .lldd_lu_reset          = isci_task_lu_reset,

diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c
index 3fd88d72a0c0127aa89050bee01f04fa541f0910..403bfee34d84d72a201fc47aabf3a47e7d5e8662 100644 (file)
--- a/drivers/scsi/isci/task.c
+++ b/drivers/scsi/isci/task.c
@@ -625,24 +625,6 @@ int isci_task_abort_task_set(
 }
 
 
-/**
- * isci_task_clear_aca() - This function is one of the SAS Domain Template
- *    functions. This is one of the Task Management functoins called by libsas.
- * @d_device: This parameter specifies the domain device associated with this
- *    request.
- * @lun: This parameter specifies the lun       associated with this request.
- *
- * status, zero indicates success.
- */
-int isci_task_clear_aca(
-       struct domain_device *d_device,
-       u8 *lun)
-{
-       return TMF_RESP_FUNC_FAILED;
-}
-
-
-
 /**
  * isci_task_clear_task_set() - This function is one of the SAS Domain Template
  *    functions. This is one of the Task Management functoins called by libsas.

diff --git a/drivers/scsi/isci/task.h b/drivers/scsi/isci/task.h
index 8f4531f22ac29372332c0b4be250dc5b28b6851c..5939cb175a20f397d451daf94190dcd31ea8871b 100644 (file)
--- a/drivers/scsi/isci/task.h
+++ b/drivers/scsi/isci/task.h
@@ -140,10 +140,6 @@ int isci_task_abort_task_set(
        struct domain_device *d_device,
        u8 *lun);
 
-int isci_task_clear_aca(
-       struct domain_device *d_device,
-       u8 *lun);
-
 int isci_task_clear_task_set(
        struct domain_device *d_device,
        u8 *lun);

diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
index f6f8ca3c8c7f59e60f14f0f94eb8dae5208fa051..1c98662db080fc96fb17cec7d1e279ef256dece8 100644 (file)
--- a/drivers/scsi/mvsas/mv_init.c
+++ b/drivers/scsi/mvsas/mv_init.c
@@ -64,7 +64,6 @@ static struct sas_domain_function_template mvs_transport_ops = {
 
        .lldd_abort_task        = mvs_abort_task,
        .lldd_abort_task_set    = mvs_abort_task_set,
-       .lldd_clear_aca         = mvs_clear_aca,
        .lldd_clear_task_set    = mvs_clear_task_set,
        .lldd_I_T_nexus_reset   = mvs_I_T_nexus_reset,
        .lldd_lu_reset          = mvs_lu_reset,

diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
index 31d1ea5a5dd2bf321184a87ba590ebe95e23d8f1..107f1993932bf257ee37f5b011cca4f0dddf364f 100644 (file)
--- a/drivers/scsi/mvsas/mv_sas.c
+++ b/drivers/scsi/mvsas/mv_sas.c
@@ -1548,17 +1548,6 @@ int mvs_abort_task_set(struct domain_device *dev, u8 *lun)
        return rc;
 }
 
-int mvs_clear_aca(struct domain_device *dev, u8 *lun)
-{
-       int rc = TMF_RESP_FUNC_FAILED;
-       struct mvs_tmf_task tmf_task;
-
-       tmf_task.tmf = TMF_CLEAR_ACA;
-       rc = mvs_debug_issue_ssp_tmf(dev, lun, &tmf_task);
-
-       return rc;
-}
-
 int mvs_clear_task_set(struct domain_device *dev, u8 *lun)
 {
        int rc = TMF_RESP_FUNC_FAILED;

diff --git a/drivers/scsi/mvsas/mv_sas.h b/drivers/scsi/mvsas/mv_sas.h
index 8ff976c9967e1095563869f8218108daaacfb93b..fa654c73beeee3f8a489f94bf5db2db016143bd0 100644 (file)
--- a/drivers/scsi/mvsas/mv_sas.h
+++ b/drivers/scsi/mvsas/mv_sas.h
@@ -441,7 +441,6 @@ int mvs_scan_finished(struct Scsi_Host *shost, unsigned long time);
 int mvs_queue_command(struct sas_task *task, gfp_t gfp_flags);
 int mvs_abort_task(struct sas_task *task);
 int mvs_abort_task_set(struct domain_device *dev, u8 *lun);
-int mvs_clear_aca(struct domain_device *dev, u8 *lun);
 int mvs_clear_task_set(struct domain_device *dev, u8 * lun);
 void mvs_port_formed(struct asd_sas_phy *sas_phy);
 void mvs_port_deformed(struct asd_sas_phy *sas_phy);

diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index a54460fe86300d1c0561fd050f1f440131a7ca5c..0659ee9aafce7fc541e10557e770562bbdff65ed 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -123,7 +123,6 @@ static struct sas_domain_function_template pm8001_transport_ops = {
 
        .lldd_abort_task        = pm8001_abort_task,
        .lldd_abort_task_set    = pm8001_abort_task_set,
-       .lldd_clear_aca         = pm8001_clear_aca,
        .lldd_clear_task_set    = pm8001_clear_task_set,
        .lldd_I_T_nexus_reset   = pm8001_I_T_nexus_reset,
        .lldd_lu_reset          = pm8001_lu_reset,

diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
index 5fb08acbc0e5e4024499bf5e2812729dcd012abd..93fe1bec25e211572e0ecae97a0849492ac4f3e6 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_sas.c
+++ b/drivers/scsi/pm8001/pm8001_sas.c
@@ -1341,14 +1341,6 @@ int pm8001_abort_task_set(struct domain_device *dev, u8 *lun)
        return pm8001_issue_ssp_tmf(dev, lun, &tmf_task);
 }
 
-int pm8001_clear_aca(struct domain_device *dev, u8 *lun)
-{
-       struct pm8001_tmf_task tmf_task;
-
-       tmf_task.tmf = TMF_CLEAR_ACA;
-       return pm8001_issue_ssp_tmf(dev, lun, &tmf_task);
-}
-
 int pm8001_clear_task_set(struct domain_device *dev, u8 *lun)
 {
        struct pm8001_tmf_task tmf_task;

diff --git a/drivers/scsi/pm8001/pm8001_sas.h b/drivers/scsi/pm8001/pm8001_sas.h
index f40a41f450d9bfe1aa34e1b44171e03edcf7d6ea..52c62a29df18a2e7e1f5877d290a999ce716788c 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_sas.h
+++ b/drivers/scsi/pm8001/pm8001_sas.h
@@ -645,7 +645,6 @@ int pm8001_scan_finished(struct Scsi_Host *shost, unsigned long time);
 int pm8001_queue_command(struct sas_task *task, gfp_t gfp_flags);
 int pm8001_abort_task(struct sas_task *task);
 int pm8001_abort_task_set(struct domain_device *dev, u8 *lun);
-int pm8001_clear_aca(struct domain_device *dev, u8 *lun);
 int pm8001_clear_task_set(struct domain_device *dev, u8 *lun);
 int pm8001_dev_found(struct domain_device *dev);
 void pm8001_dev_gone(struct domain_device *dev);

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 6fe125a71b6088390fbca461b53131ea7d25499f..22c54f21206d4431d41ac2a60b61b90e8578a410 100644 (file)
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -636,7 +636,6 @@ struct sas_domain_function_template {
        /* 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_ata_check_ready)(struct domain_device *);