[SCSI] libsas: drop sata port multiplier infrastructure

On the way to add a new sata_device field, noticed that libsas is
carrying port multiplier infrastructure that is explicitly disabled by
sas_discover_sata().  The aic94xx touches the unused port_no, so leave
that field in case there was some use for it.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index b031d238eb7bf60b4ca03922b0ed5e778846dcd5..3e9dc1a84358a540dd5ad4324b63fd4f9bf98039 100644 (file)
--- a/drivers/scsi/libsas/sas_discover.c
+++ b/drivers/scsi/libsas/sas_discover.c
@@ -46,12 +46,6 @@ void sas_init_dev(struct domain_device *dev)
                INIT_LIST_HEAD(&dev->ex_dev.children);
                mutex_init(&dev->ex_dev.cmd_mutex);
                break;
-       case SATA_DEV:
-       case SATA_PM:
-       case SATA_PM_PORT:
-       case SATA_PENDING:
-               INIT_LIST_HEAD(&dev->sata_dev.children);
-               break;
        default:
                break;
        }

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index acefe13ebacfff30241db4f7cfc05155dd7f55dd..29a8cc7831af36852a5fa952e8acf02d34929b5c 100644 (file)
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -169,7 +169,6 @@ struct sata_device {
         enum   ata_command_set command_set;
         struct smp_resp        rps_resp; /* report_phy_sata_resp */
         u8     port_no;        /* port number, if this is a PM (Port) */
-        struct list_head children; /* PM Ports if this is a PM */
 
        struct ata_port *ap;
        struct ata_host ata_host;