[PATCH RFC v3 22/22] scsi: libsas: Delete sas_task_slow.timer

John Garry
2022-10-25T09:54:17Z

We now send every slow task through the block layer and use the timeout
facility there, so delete sas_task_slow.timer .

Signed-off-by: John Garry <john.garry@huawei.com>
---
drivers/scsi/libsas/sas_init.c | 1 -
drivers/scsi/libsas/sas_scsi_host.c | 1 -
include/scsi/libsas.h | 3 ---
3 files changed, 5 deletions(-)

diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c
index c3f602bd2c4c..8b0e72c447d0 100644
--- a/drivers/scsi/libsas/sas_init.c
+++ b/drivers/scsi/libsas/sas_init.c
@@ -50,7 +50,6 @@ struct sas_task *sas_alloc_slow_task(gfp_t flags)

task->slow_task = slow;
slow->task = task;
- timer_setup(&slow->timer, NULL, 0);
init_completion(&slow->completion);

return task;
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index a93e019a7dbf..4fdd84868ac2 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -909,7 +909,6 @@ EXPORT_SYMBOL_GPL(sas_bios_param);

void sas_task_internal_done(struct sas_task *task)
{
- del_timer(&task->slow_task->timer);
complete(&task->slow_task->completion);
}

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 60543d8b01d4..f903be5895a9 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -9,8 +9,6 @@
#ifndef _LIBSAS_H_
#define _LIBSAS_H_

-
-#include <linux/timer.h>
#include <linux/pci.h>
#include <scsi/sas.h>
#include <linux/libata.h>
@@ -628,7 +626,6 @@ struct sas_task_slow {
/* standard/extra infrastructure for slow path commands (SMP and
* internal lldd commands
*/
- struct timer_list timer;
struct completion completion;
struct sas_task *task;
};
--
2.35.3