scsi: hisi_sas: remove some unneeded structure members

This patch removes unneeded structure elements:

- hisi_sas_phy.dev_sas_addr: only ever written
	- Also remove associated function which writes it,
	  hisi_sas_init_add().

- hisi_sas_device.attached_phy: only ever written
	- Also remove code to set it in hisi_sas_dev_found()

Signed-off-by: John Garry <john.garry@huawei.com>
Reviewed-by: Xiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index d1153e8e846bda304b8a071d4bfa170553d1d49f..d413d05fda2629a12763c9888edf473f714fcbcc 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -137,7 +137,6 @@ struct hisi_sas_phy {
        struct asd_sas_phy      sas_phy;
        struct sas_identify     identify;
        u64             port_id; /* from hw */
-       u64             dev_sas_addr;
        u64             frame_rcvd_size;
        u8              frame_rcvd[32];
        u8              phy_attached;
@@ -174,7 +173,6 @@ struct hisi_sas_device {
        struct completion *completion;
        struct hisi_sas_dq      *dq;
        struct list_head        list;
-       u64 attached_phy;
        enum sas_device_type    dev_type;
        int device_id;
        int sata_idx;
@@ -440,7 +438,6 @@ extern struct scsi_transport_template *hisi_sas_stt;
 extern struct scsi_host_template *hisi_sas_sht;
 
 extern void hisi_sas_stop_phys(struct hisi_hba *hisi_hba);
-extern void hisi_sas_init_add(struct hisi_hba *hisi_hba);
 extern int hisi_sas_alloc(struct hisi_hba *hisi_hba, struct Scsi_Host *shost);
 extern void hisi_sas_free(struct hisi_hba *hisi_hba);
 extern u8 hisi_sas_get_ata_protocol(struct host_to_dev_fis *fis,

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 8557fd08ed8e03a5a51c134d04664ce12a2e30e4..d1a61b1e591b06d82566b87177a10583c005a5ac 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -577,10 +577,8 @@ static int hisi_sas_dev_found(struct domain_device *device)
                for (phy_no = 0; phy_no < phy_num; phy_no++) {
                        phy = &parent_dev->ex_dev.ex_phy[phy_no];
                        if (SAS_ADDR(phy->attached_sas_addr) ==
-                               SAS_ADDR(device->sas_addr)) {
-                               sas_dev->attached_phy = phy_no;
+                               SAS_ADDR(device->sas_addr))
                                break;
-                       }
                }
 
                if (phy_no == phy_num) {
@@ -2079,17 +2077,6 @@ static struct Scsi_Host *hisi_sas_shost_alloc(struct platform_device *pdev,
        return NULL;
 }
 
-void hisi_sas_init_add(struct hisi_hba *hisi_hba)
-{
-       int i;
-
-       for (i = 0; i < hisi_hba->n_phy; i++)
-               memcpy(&hisi_hba->phy[i].dev_sas_addr,
-                      hisi_hba->sas_addr,
-                      SAS_ADDR_SIZE);
-}
-EXPORT_SYMBOL_GPL(hisi_sas_init_add);
-
 int hisi_sas_probe(struct platform_device *pdev,
                         const struct hisi_sas_hw *hw)
 {
@@ -2143,8 +2130,6 @@ int hisi_sas_probe(struct platform_device *pdev,
                sha->sas_port[i] = &hisi_hba->port[i].sas_port;
        }
 
-       hisi_sas_init_add(hisi_hba);
-
        rc = scsi_add_host(shost, &pdev->dev);
        if (rc)
                goto err_out_ha;

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 760724ae4d6f429362171aa192396ac239b44139..33735a7082b6dfab094c6a734517f68f0a820ec2 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -2134,8 +2134,6 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                sha->sas_port[i] = &hisi_hba->port[i].sas_port;
        }
 
-       hisi_sas_init_add(hisi_hba);
-
        rc = scsi_add_host(shost, dev);
        if (rc)
                goto err_out_ha;