thunderbolt: Use weight constants in tb_usb3_consumed_bandwidth()

[ Upstream commit 4d24db0c801461adeefd7e0bdc98c79c60ccefb0 ]

Instead of magic numbers use the constants we introduced in the previous
commit to make the code more readable. 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 9947b9d0d51a983d3e4a4b0976e9dbfb4cf14e81..b81344c6c06a3ee3288fd422d2337371c854375d 100644 (file)
--- a/drivers/thunderbolt/tunnel.c
+++ b/drivers/thunderbolt/tunnel.c
@@ -1747,14 +1747,17 @@ static int tb_usb3_activate(struct tb_tunnel *tunnel, bool activate)
 static int tb_usb3_consumed_bandwidth(struct tb_tunnel *tunnel,
                int *consumed_up, int *consumed_down)
 {
-       int pcie_enabled = tb_acpi_may_tunnel_pcie();
+       int pcie_weight = tb_acpi_may_tunnel_pcie() ? TB_PCI_WEIGHT : 0;
 
        /*
         * PCIe tunneling, if enabled, affects the USB3 bandwidth so
         * take that it into account here.
         */
-       *consumed_up = tunnel->allocated_up * (3 + pcie_enabled) / 3;
-       *consumed_down = tunnel->allocated_down * (3 + pcie_enabled) / 3;
+       *consumed_up = tunnel->allocated_up *
+               (TB_USB3_WEIGHT + pcie_weight) / TB_USB3_WEIGHT;
+       *consumed_down = tunnel->allocated_down *
+               (TB_USB3_WEIGHT + pcie_weight) / TB_USB3_WEIGHT;
+
        return 0;
 }