]> git.karo-electronics.de Git - linux-beck.git/commitdiff
scsi_transport_sas: Remove check for SAS expander when querying bay/enclosure IDs.
authorJordan Hargrave <jharg93@gmail.com>
Mon, 13 Jul 2015 14:27:33 +0000 (09:27 -0500)
committerJames Bottomley <JBottomley@Odin.com>
Sun, 6 Sep 2015 18:13:41 +0000 (11:13 -0700)
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>
drivers/scsi/scsi_transport_sas.c

index 9a058194b9bdb2ae37079663af21a9f4dad33502..30d26e345dcc797430667ebe2ea0fa1f288fc372 100644 (file)
@@ -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;