summaryrefslogtreecommitdiffstats
path: root/include/scsi
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@steeleye.com>2006-03-18 22:00:50 +0100
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-03-19 17:21:16 +0100
commit2f8600dff2b140096a7df781884e918a16aa90e0 (patch)
tree313d53e23c618950b078b6fd39d9e078fdf79011 /include/scsi
parent[SCSI] convert mptsas over to end_device/expander allocations (diff)
downloadlinux-2f8600dff2b140096a7df781884e918a16aa90e0.tar.xz
linux-2f8600dff2b140096a7df781884e918a16aa90e0.zip
[SCSI] eliminate rphy allocation in favour of expander/end device allocation
This allows the removal of the contained flag and also does a bit of class renaming (sas_rphy->sas_device). Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/scsi')
-rw-r--r--include/scsi/scsi_transport_sas.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/scsi/scsi_transport_sas.h b/include/scsi/scsi_transport_sas.h
index 2943ccc22a43..93cfb4bf4211 100644
--- a/include/scsi/scsi_transport_sas.h
+++ b/include/scsi/scsi_transport_sas.h
@@ -82,10 +82,6 @@ struct sas_rphy {
struct sas_identify identify;
struct list_head list;
u32 scsi_target_id;
- /* temporary expedient: mark the rphy as being contained
- * within a type specific rphy
- * FIXME: pull this out when everything uses the containers */
- unsigned contained:1;
};
#define dev_to_rphy(d) \
@@ -145,7 +141,6 @@ extern int sas_phy_add(struct sas_phy *);
extern void sas_phy_delete(struct sas_phy *);
extern int scsi_is_sas_phy(const struct device *);
-extern struct sas_rphy *sas_rphy_alloc(struct sas_phy *);
extern struct sas_rphy *sas_end_device_alloc(struct sas_phy *);
extern struct sas_rphy *sas_expander_alloc(struct sas_phy *, enum sas_device_type);
void sas_rphy_free(struct sas_rphy *);