aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJordan Hargrave <jharg93@gmail.com>2015-07-13 09:27:33 -0500
committerJames Bottomley <JBottomley@Odin.com>2015-09-06 11:13:41 -0700
commit0c416b54f29151a31999868d59c64ace11589d1b (patch)
treef58d72aba4fd7bfaf6d9c14dd6dd428f8d6c48be /drivers
parentscsi_debug: resp_request: remove unused variable (diff)
downloadlinux-dev-0c416b54f29151a31999868d59c64ace11589d1b.tar.xz
linux-dev-0c416b54f29151a31999868d59c64ace11589d1b.zip
scsi_transport_sas: Remove check for SAS expander when querying bay/enclosure IDs.
Dell Server backplanes can report bay/enclosure IDs without an expander present. This patch allows the bay/enclosure IDs to be propagaged to sysfs.we Signed-off-by: Jordan Hargrave <jordan_hargrave@dell.com> Reviewed-by: Hannes Reinecke <hare@suse.com> Signed-off-by: James Bottomley <JBottomley@Odin.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/scsi_transport_sas.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index 9a058194b9bd..30d26e345dcc 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -1222,13 +1222,6 @@ show_sas_rphy_enclosure_identifier(struct device *dev,
u64 identifier;
int error;
- /*
- * Only devices behind an expander are supported, because the
- * enclosure identifier is a SMP feature.
- */
- if (scsi_is_sas_phy_local(phy))
- return -EINVAL;
-
error = i->f->get_enclosure_identifier(rphy, &identifier);
if (error)
return error;
@@ -1248,9 +1241,6 @@ show_sas_rphy_bay_identifier(struct device *dev,
struct sas_internal *i = to_sas_internal(shost->transportt);
int val;
- if (scsi_is_sas_phy_local(phy))
- return -EINVAL;
-
val = i->f->get_bay_identifier(rphy);
if (val < 0)
return val;