| Message ID | 20230814141022.36875-2-john.g.garry@oracle.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | libsas: Some tidy-up | expand |
On 8/14/23 23:10, John Garry wrote: > 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> Looks good. Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
On 2023/8/14 22:10, John Garry wrote: > 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> > --- > drivers/scsi/aic94xx/aic94xx_init.c | 1 - > drivers/scsi/hisi_sas/hisi_sas_main.c | 1 - > drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 1 - > drivers/scsi/isci/init.c | 1 - > drivers/scsi/mvsas/mv_init.c | 1 - > drivers/scsi/pm8001/pm8001_init.c | 1 - > include/scsi/libsas.h | 1 - > 7 files changed, 7 deletions(-) Reviewed-by: Jason Yan <yanaijie@huawei.com>
On 8/14/23 16:10, John Garry wrote: > 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> > --- > drivers/scsi/aic94xx/aic94xx_init.c | 1 - > drivers/scsi/hisi_sas/hisi_sas_main.c | 1 - > drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 1 - > drivers/scsi/isci/init.c | 1 - > drivers/scsi/mvsas/mv_init.c | 1 - > drivers/scsi/pm8001/pm8001_init.c | 1 - > include/scsi/libsas.h | 1 - > 7 files changed, 7 deletions(-) > Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c index f7f81f6c3fbf..6603e91cee8a 100644 --- 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 7a62590f8730..9585f1ed8ae5 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -2514,7 +2514,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 a676558b096b..7b40f0eed703 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c @@ -4973,7 +4973,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 ac1e04b86d8f..c3704208511b 100644 --- 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 49e2a5e7ce54..aea70ec308f9 100644 --- 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 2e886c1d867d..1e0154d08393 100644 --- 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 159823e0afbf..ccaf8f6b1055 100644 --- 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;
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> --- drivers/scsi/aic94xx/aic94xx_init.c | 1 - drivers/scsi/hisi_sas/hisi_sas_main.c | 1 - drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 1 - drivers/scsi/isci/init.c | 1 - drivers/scsi/mvsas/mv_init.c | 1 - drivers/scsi/pm8001/pm8001_init.c | 1 - include/scsi/libsas.h | 1 - 7 files changed, 7 deletions(-)