scsi: libsas: Delete sas_ha_struct.lldd_module

Since libsas was introduced in commit 2908d778ab3e ("[SCSI] aic94xx: new
driver"), sas_ha_struct.lldd_module has only ever been set, so remove it.

Struct scsi_host_template already has a reference to the LLD driver
module as to stop the driver being removed unexpectedly.

Signed-off-by: John Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20230815115156.343535-2-john.g.garry@oracle.com
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Jason Yan <yanaijie@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
index f7f81f6c3fbfc228fdf618f7b1425239002b248b..6603e91cee8a028e96b7f833d7c354b272d9ff4e 100644 (file)
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -667,7 +667,6 @@ static int asd_register_sas_ha(struct asd_ha_struct *asd_ha)
        }
 
        asd_ha->sas_ha.sas_ha_name = (char *) asd_ha->name;
-       asd_ha->sas_ha.lldd_module = THIS_MODULE;
        asd_ha->sas_ha.sas_addr = &asd_ha->hw_prof.sas_addr[0];
 
        for (i = 0; i < ASD_MAX_PHYS; i++) {

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 8f22ece957bd4d3b5b88a16f3d3ceb5730af64da..189d058a0e02c6586ae4b2bd572849ad27b4cd0e 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -2519,7 +2519,6 @@ int hisi_sas_probe(struct platform_device *pdev,
 
        sha->sas_ha_name = DRV_NAME;
        sha->dev = hisi_hba->dev;
-       sha->lldd_module = THIS_MODULE;
        sha->sas_addr = &hisi_hba->sas_addr[0];
        sha->num_phys = hisi_hba->n_phy;
        sha->core.shost = hisi_hba->shost;

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 20e1607c62828b4c774ff1be7cabe7e6e7e85e23..3206ee3560879585c5ee0b299e105b0d5f93859c 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -4967,7 +4967,6 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        sha->sas_ha_name = DRV_NAME;
        sha->dev = dev;
-       sha->lldd_module = THIS_MODULE;
        sha->sas_addr = &hisi_hba->sas_addr[0];
        sha->num_phys = hisi_hba->n_phy;
 

diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
index ac1e04b86d8fed3426fa6eb3b7c878b7d7136152..c3704208511bb631fcf02787a60efa47a47e4030 100644 (file)
--- a/drivers/scsi/isci/init.c
+++ b/drivers/scsi/isci/init.c
@@ -250,7 +250,6 @@ static int isci_register_sas_ha(struct isci_host *isci_host)
                return -ENOMEM;
 
        sas_ha->sas_ha_name = DRV_NAME;
-       sas_ha->lldd_module = THIS_MODULE;
        sas_ha->sas_addr    = &isci_host->phys[0].sas_addr[0];
 
        for (i = 0; i < SCI_MAX_PHYS; i++) {

diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
index 49e2a5e7ce5493d79639f9cdb9932a930ee27a42..aea70ec308f952f7df73cfb2e3a03b9446efc223 100644 (file)
--- a/drivers/scsi/mvsas/mv_init.c
+++ b/drivers/scsi/mvsas/mv_init.c
@@ -458,7 +458,6 @@ static void  mvs_post_sas_ha_init(struct Scsi_Host *shost,
 
        sha->sas_ha_name = DRV_NAME;
        sha->dev = mvi->dev;
-       sha->lldd_module = THIS_MODULE;
        sha->sas_addr = &mvi->sas_addr[0];
 
        sha->num_phys = nr_core * chip_info->n_phy;

diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index 2e886c1d867d4c66d387900b24baabb9b92d26c5..1e0154d08393f3f812e070c10d7491971e7d5b36 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -654,7 +654,6 @@ static void  pm8001_post_sas_ha_init(struct Scsi_Host *shost,
        sha->sas_ha_name = DRV_NAME;
        sha->dev = pm8001_ha->dev;
        sha->strict_wide_ports = 1;
-       sha->lldd_module = THIS_MODULE;
        sha->sas_addr = &pm8001_ha->sas_addr[0];
        sha->num_phys = chip_info->n_phy;
        sha->core.shost = shost;

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 159823e0afbf6797ee30a4a8d15e3d782a02d934..ccaf8f6b105515297e68350f502e62f9a6f3dcd6 100644 (file)
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -376,7 +376,6 @@ struct sas_ha_struct {
 /* public: */
        char *sas_ha_name;
        struct device *dev;       /* should be set */
-       struct module *lldd_module; /* should be set */
 
        struct workqueue_struct *event_q;
        struct workqueue_struct *disco_q;