thunderbolt: Use constants for path weight and priority

[ Upstream commit f73edddfa2a64a185c65a33f100778169c92fc25 ]

Makes it easier to follow and update. 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/tunnel.c b/drivers/thunderbolt/tunnel.c
index 389b8dfc244724d1f02e6876406a782bf62609cc..9947b9d0d51a983d3e4a4b0976e9dbfb4cf14e81 100644 (file)
--- a/drivers/thunderbolt/tunnel.c
+++ b/drivers/thunderbolt/tunnel.c
@@ -21,12 +21,18 @@
 #define TB_PCI_PATH_DOWN               0
 #define TB_PCI_PATH_UP                 1
 
+#define TB_PCI_PRIORITY                        3
+#define TB_PCI_WEIGHT                  1
+
 /* USB3 adapters use always HopID of 8 for both directions */
 #define TB_USB3_HOPID                  8
 
 #define TB_USB3_PATH_DOWN              0
 #define TB_USB3_PATH_UP                        1
 
+#define TB_USB3_PRIORITY               3
+#define TB_USB3_WEIGHT                 3
+
 /* DP adapters use HopID 8 for AUX and 9 for Video */
 #define TB_DP_AUX_TX_HOPID             8
 #define TB_DP_AUX_RX_HOPID             8
@@ -36,6 +42,12 @@
 #define TB_DP_AUX_PATH_OUT             1
 #define TB_DP_AUX_PATH_IN              2
 
+#define TB_DP_VIDEO_PRIORITY           1
+#define TB_DP_VIDEO_WEIGHT             1
+
+#define TB_DP_AUX_PRIORITY             2
+#define TB_DP_AUX_WEIGHT               1
+
 /* Minimum number of credits needed for PCIe path */
 #define TB_MIN_PCIE_CREDITS            6U
 /*
@@ -46,6 +58,9 @@
 /* Minimum number of credits for DMA path */
 #define TB_MIN_DMA_CREDITS             1
 
+#define TB_DMA_PRIORITY                        5
+#define TB_DMA_WEIGHT                  1
+
 static unsigned int dma_credits = TB_DMA_CREDITS;
 module_param(dma_credits, uint, 0444);
 MODULE_PARM_DESC(dma_credits, "specify custom credits for DMA tunnels (default: "
@@ -213,8 +228,8 @@ static int tb_pci_init_path(struct tb_path *path)
        path->egress_shared_buffer = TB_PATH_NONE;
        path->ingress_fc_enable = TB_PATH_ALL;
        path->ingress_shared_buffer = TB_PATH_NONE;
-       path->priority = 3;
-       path->weight = 1;
+       path->priority = TB_PCI_PRIORITY;
+       path->weight = TB_PCI_WEIGHT;
        path->drop_packages = 0;
 
        tb_path_for_each_hop(path, hop) {
@@ -1152,8 +1167,8 @@ static void tb_dp_init_aux_path(struct tb_path *path)
        path->egress_shared_buffer = TB_PATH_NONE;
        path->ingress_fc_enable = TB_PATH_ALL;
        path->ingress_shared_buffer = TB_PATH_NONE;
-       path->priority = 2;
-       path->weight = 1;
+       path->priority = TB_DP_AUX_PRIORITY;
+       path->weight = TB_DP_AUX_WEIGHT;
 
        tb_path_for_each_hop(path, hop)
                tb_dp_init_aux_credits(hop);
@@ -1196,8 +1211,8 @@ static int tb_dp_init_video_path(struct tb_path *path)
        path->egress_shared_buffer = TB_PATH_NONE;
        path->ingress_fc_enable = TB_PATH_NONE;
        path->ingress_shared_buffer = TB_PATH_NONE;
-       path->priority = 1;
-       path->weight = 1;
+       path->priority = TB_DP_VIDEO_PRIORITY;
+       path->weight = TB_DP_VIDEO_WEIGHT;
 
        tb_path_for_each_hop(path, hop) {
                int ret;
@@ -1471,8 +1486,8 @@ static int tb_dma_init_rx_path(struct tb_path *path, unsigned int credits)
        path->ingress_fc_enable = TB_PATH_ALL;
        path->egress_shared_buffer = TB_PATH_NONE;
        path->ingress_shared_buffer = TB_PATH_NONE;
-       path->priority = 5;
-       path->weight = 1;
+       path->priority = TB_DMA_PRIORITY;
+       path->weight = TB_DMA_WEIGHT;
        path->clear_fc = true;
 
        /*
@@ -1505,8 +1520,8 @@ static int tb_dma_init_tx_path(struct tb_path *path, unsigned int credits)
        path->ingress_fc_enable = TB_PATH_ALL;
        path->egress_shared_buffer = TB_PATH_NONE;
        path->ingress_shared_buffer = TB_PATH_NONE;
-       path->priority = 5;
-       path->weight = 1;
+       path->priority = TB_DMA_PRIORITY;
+       path->weight = TB_DMA_WEIGHT;
        path->clear_fc = true;
 
        tb_path_for_each_hop(path, hop) {
@@ -1845,8 +1860,8 @@ static void tb_usb3_init_path(struct tb_path *path)
        path->egress_shared_buffer = TB_PATH_NONE;
        path->ingress_fc_enable = TB_PATH_ALL;
        path->ingress_shared_buffer = TB_PATH_NONE;
-       path->priority = 3;
-       path->weight = 3;
+       path->priority = TB_USB3_PRIORITY;
+       path->weight = TB_USB3_WEIGHT;
        path->drop_packages = 0;
 
        tb_path_for_each_hop(path, hop)