thunderbolt: Introduce tb_switch_depth()

[ Upstream commit c4ff14436952c3d0dd05769d76cf48e73a253b48 ]

This is useful helper to find out the depth of a connected router.
Convert the existing users to call this helper instead of open-coding.

No functional changes.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Qin Wan <qin.wan@hp.com>
Signed-off-by: Alexandru Gagniuc <alexandru.gagniuc@hp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c
index 4ea0536ec5cfb20b29c4451297961598ab55dd26..39ec8da576ef836239883b4f1cb24f9ebd0e6c5f 100644 (file)
--- a/drivers/thunderbolt/tb.c
+++ b/drivers/thunderbolt/tb.c
@@ -255,13 +255,13 @@ static int tb_enable_clx(struct tb_switch *sw)
         * this in the future to cover the whole topology if it turns
         * out to be beneficial.
         */
-       while (sw && sw->config.depth > 1)
+       while (sw && tb_switch_depth(sw) > 1)
                sw = tb_switch_parent(sw);
 
        if (!sw)
                return 0;
 
-       if (sw->config.depth != 1)
+       if (tb_switch_depth(sw) != 1)
                return 0;
 
        /*

diff --git a/drivers/thunderbolt/tb.h b/drivers/thunderbolt/tb.h
index 4cd5f48e3dee647ad33f4e95b213370b9317b472..d2ef9575231cb3dd50408a86842d58ba10615490 100644 (file)
--- a/drivers/thunderbolt/tb.h
+++ b/drivers/thunderbolt/tb.h
@@ -868,6 +868,15 @@ static inline struct tb_port *tb_switch_downstream_port(struct tb_switch *sw)
        return tb_port_at(tb_route(sw), tb_switch_parent(sw));
 }
 
+/**
+ * tb_switch_depth() - Returns depth of the connected router
+ * @sw: Router
+ */
+static inline int tb_switch_depth(const struct tb_switch *sw)
+{
+       return sw->config.depth;
+}
+
 static inline bool tb_switch_is_light_ridge(const struct tb_switch *sw)
 {
        return sw->config.vendor_id == PCI_VENDOR_ID_INTEL &&