Skip to content

Commit b1bc497

Browse files
johnpgarrymartinkpetersen
authored andcommitted
scsi: libsas: Delete sas_ha_struct.lldd_module
Since libsas was introduced in commit 2908d77 ("[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>
1 parent 06c2afb commit b1bc497

File tree

7 files changed

+0
-7
lines changed

7 files changed

+0
-7
lines changed

drivers/scsi/aic94xx/aic94xx_init.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,6 @@ static int asd_register_sas_ha(struct asd_ha_struct *asd_ha)
667667
}
668668

669669
asd_ha->sas_ha.sas_ha_name = (char *) asd_ha->name;
670-
asd_ha->sas_ha.lldd_module = THIS_MODULE;
671670
asd_ha->sas_ha.sas_addr = &asd_ha->hw_prof.sas_addr[0];
672671

673672
for (i = 0; i < ASD_MAX_PHYS; i++) {

drivers/scsi/hisi_sas/hisi_sas_main.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2519,7 +2519,6 @@ int hisi_sas_probe(struct platform_device *pdev,
25192519

25202520
sha->sas_ha_name = DRV_NAME;
25212521
sha->dev = hisi_hba->dev;
2522-
sha->lldd_module = THIS_MODULE;
25232522
sha->sas_addr = &hisi_hba->sas_addr[0];
25242523
sha->num_phys = hisi_hba->n_phy;
25252524
sha->core.shost = hisi_hba->shost;

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4967,7 +4967,6 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id)
49674967

49684968
sha->sas_ha_name = DRV_NAME;
49694969
sha->dev = dev;
4970-
sha->lldd_module = THIS_MODULE;
49714970
sha->sas_addr = &hisi_hba->sas_addr[0];
49724971
sha->num_phys = hisi_hba->n_phy;
49734972

drivers/scsi/isci/init.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@ static int isci_register_sas_ha(struct isci_host *isci_host)
250250
return -ENOMEM;
251251

252252
sas_ha->sas_ha_name = DRV_NAME;
253-
sas_ha->lldd_module = THIS_MODULE;
254253
sas_ha->sas_addr = &isci_host->phys[0].sas_addr[0];
255254

256255
for (i = 0; i < SCI_MAX_PHYS; i++) {

drivers/scsi/mvsas/mv_init.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,6 @@ static void mvs_post_sas_ha_init(struct Scsi_Host *shost,
458458

459459
sha->sas_ha_name = DRV_NAME;
460460
sha->dev = mvi->dev;
461-
sha->lldd_module = THIS_MODULE;
462461
sha->sas_addr = &mvi->sas_addr[0];
463462

464463
sha->num_phys = nr_core * chip_info->n_phy;

drivers/scsi/pm8001/pm8001_init.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,6 @@ static void pm8001_post_sas_ha_init(struct Scsi_Host *shost,
654654
sha->sas_ha_name = DRV_NAME;
655655
sha->dev = pm8001_ha->dev;
656656
sha->strict_wide_ports = 1;
657-
sha->lldd_module = THIS_MODULE;
658657
sha->sas_addr = &pm8001_ha->sas_addr[0];
659658
sha->num_phys = chip_info->n_phy;
660659
sha->core.shost = shost;

include/scsi/libsas.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,6 @@ struct sas_ha_struct {
376376
/* public: */
377377
char *sas_ha_name;
378378
struct device *dev; /* should be set */
379-
struct module *lldd_module; /* should be set */
380379

381380
struct workqueue_struct *event_q;
382381
struct workqueue_struct *disco_q;

0 commit comments

Comments
 (0)