This is done as thread. Also remove an unused member of the lpfc_vport structure. Cc: James Smart <james.smart@xxxxxxxxxxxx> Cc: Dick Kennedy <dick.kennedy@xxxxxxxxxxxx> Signed-off-by: Davidlohr Bueso <dave@xxxxxxxxxxxx> --- drivers/scsi/lpfc/lpfc.h | 2 -- drivers/scsi/lpfc/lpfc_disc.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h index da9070cdad91..05da8ccb0933 100644 --- a/drivers/scsi/lpfc/lpfc.h +++ b/drivers/scsi/lpfc/lpfc.h @@ -645,8 +645,6 @@ struct lpfc_vport { struct lpfc_name fc_nodename; /* fc nodename */ struct lpfc_name fc_portname; /* fc portname */ - struct lpfc_work_evt disc_timeout_evt; - struct timer_list fc_disctmo; /* Discovery rescue timer */ uint8_t fc_ns_retry; /* retries for fabric nameserver */ uint32_t fc_prli_sent; /* cntr for outstanding PRLIs */ diff --git a/drivers/scsi/lpfc/lpfc_disc.h b/drivers/scsi/lpfc/lpfc_disc.h index 37a4b79010bf..40f458ee1aec 100644 --- a/drivers/scsi/lpfc/lpfc_disc.h +++ b/drivers/scsi/lpfc/lpfc_disc.h @@ -44,7 +44,7 @@ enum lpfc_work_type { LPFC_EVT_RECOVER_PORT }; -/* structure used to queue event to the discovery tasklet */ +/* structure used to queue event to the discovery thread */ struct lpfc_work_evt { struct list_head evt_listp; void *evt_arg1; -- 2.36.1