aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2012-06-22 02:36:25 -0400
committerJames Bottomley <JBottomley@Parallels.com>2012-07-20 03:58:53 -0400
commita494fd5bd98bb35d5a9a274fecb768e14ebf499c (patch)
treeee24c3bf1136b405eb44a99bb592a0704e01349c
parentb17caa174a7e1fd2e17b26e210d4ee91c4c28b37 (diff)
[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>
-rw-r--r--drivers/scsi/libsas/sas_discover.c6
-rw-r--r--include/scsi/libsas.h1
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index b031d238eb7b..3e9dc1a84358 100644
--- 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)
46 INIT_LIST_HEAD(&dev->ex_dev.children); 46 INIT_LIST_HEAD(&dev->ex_dev.children);
47 mutex_init(&dev->ex_dev.cmd_mutex); 47 mutex_init(&dev->ex_dev.cmd_mutex);
48 break; 48 break;
49 case SATA_DEV:
50 case SATA_PM:
51 case SATA_PM_PORT:
52 case SATA_PENDING:
53 INIT_LIST_HEAD(&dev->sata_dev.children);
54 break;
55 default: 49 default:
56 break; 50 break;
57 } 51 }
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index acefe13ebacf..29a8cc7831af 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -169,7 +169,6 @@ struct sata_device {
169 enum ata_command_set command_set; 169 enum ata_command_set command_set;
170 struct smp_resp rps_resp; /* report_phy_sata_resp */ 170 struct smp_resp rps_resp; /* report_phy_sata_resp */
171 u8 port_no; /* port number, if this is a PM (Port) */ 171 u8 port_no; /* port number, if this is a PM (Port) */
172 struct list_head children; /* PM Ports if this is a PM */
173 172
174 struct ata_port *ap; 173 struct ata_port *ap;
175 struct ata_host ata_host; 174 struct ata_host ata_host;