Commit 17a8f815 authored by Mika Westerberg's avatar Mika Westerberg

thunderbolt: Expand controller name in tb_switch_is_xy()

For a casual reader tb_switch_is_cr() does not tell much so instead
spell out the full controller name in the function name. For example
tb_switch_is_cr() becomes tb_switch_is_cactus_ridge() which is easier
to understand.
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent 0d46c08d
...@@ -33,9 +33,9 @@ static int tb_port_enable_tmu(struct tb_port *port, bool enable) ...@@ -33,9 +33,9 @@ static int tb_port_enable_tmu(struct tb_port *port, bool enable)
* Legacy devices need to have TMU access enabled before port * Legacy devices need to have TMU access enabled before port
* space can be fully accessed. * space can be fully accessed.
*/ */
if (tb_switch_is_lr(sw)) if (tb_switch_is_light_ridge(sw))
offset = 0x26; offset = 0x26;
else if (tb_switch_is_er(sw)) else if (tb_switch_is_eagle_ridge(sw))
offset = 0x2a; offset = 0x2a;
else else
return 0; return 0;
...@@ -60,7 +60,7 @@ static void tb_port_dummy_read(struct tb_port *port) ...@@ -60,7 +60,7 @@ static void tb_port_dummy_read(struct tb_port *port)
* reading stale data on next read perform one dummy read after * reading stale data on next read perform one dummy read after
* port capabilities are walked. * port capabilities are walked.
*/ */
if (tb_switch_is_lr(port->sw)) { if (tb_switch_is_light_ridge(port->sw)) {
u32 dummy; u32 dummy;
tb_port_read(port, &dummy, TB_CFG_PORT, 0, 1); tb_port_read(port, &dummy, TB_CFG_PORT, 0, 1);
......
...@@ -342,9 +342,9 @@ static struct tb_port *tb_find_pcie_down(struct tb_switch *sw, ...@@ -342,9 +342,9 @@ static struct tb_port *tb_find_pcie_down(struct tb_switch *sw,
* Hard-coded Thunderbolt port to PCIe down port mapping * Hard-coded Thunderbolt port to PCIe down port mapping
* per controller. * per controller.
*/ */
if (tb_switch_is_cr(sw)) if (tb_switch_is_cactus_ridge(sw))
index = !phy_port ? 6 : 7; index = !phy_port ? 6 : 7;
else if (tb_switch_is_fr(sw)) else if (tb_switch_is_falcon_ridge(sw))
index = !phy_port ? 6 : 8; index = !phy_port ? 6 : 8;
else else
goto out; goto out;
......
...@@ -576,17 +576,17 @@ static inline struct tb_switch *tb_switch_parent(struct tb_switch *sw) ...@@ -576,17 +576,17 @@ static inline struct tb_switch *tb_switch_parent(struct tb_switch *sw)
return tb_to_switch(sw->dev.parent); return tb_to_switch(sw->dev.parent);
} }
static inline bool tb_switch_is_lr(const struct tb_switch *sw) static inline bool tb_switch_is_light_ridge(const struct tb_switch *sw)
{ {
return sw->config.device_id == PCI_DEVICE_ID_INTEL_LIGHT_RIDGE; return sw->config.device_id == PCI_DEVICE_ID_INTEL_LIGHT_RIDGE;
} }
static inline bool tb_switch_is_er(const struct tb_switch *sw) static inline bool tb_switch_is_eagle_ridge(const struct tb_switch *sw)
{ {
return sw->config.device_id == PCI_DEVICE_ID_INTEL_EAGLE_RIDGE; return sw->config.device_id == PCI_DEVICE_ID_INTEL_EAGLE_RIDGE;
} }
static inline bool tb_switch_is_cr(const struct tb_switch *sw) static inline bool tb_switch_is_cactus_ridge(const struct tb_switch *sw)
{ {
switch (sw->config.device_id) { switch (sw->config.device_id) {
case PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_2C: case PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_2C:
...@@ -597,7 +597,7 @@ static inline bool tb_switch_is_cr(const struct tb_switch *sw) ...@@ -597,7 +597,7 @@ static inline bool tb_switch_is_cr(const struct tb_switch *sw)
} }
} }
static inline bool tb_switch_is_fr(const struct tb_switch *sw) static inline bool tb_switch_is_falcon_ridge(const struct tb_switch *sw)
{ {
switch (sw->config.device_id) { switch (sw->config.device_id) {
case PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_BRIDGE: case PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_BRIDGE:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment