hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

thunderbolt: Fix typos and magic number 

Fix typo in tb_cfg_print_error() message.  Fix bytecount in struct
tb_drom_entry_port comment.  Replace magic number in tb_switch_alloc().
Rename tb_sw_set_unpplugged() and TB_CAL_IECS to fix typos.

[bhelgaas: no functional change intended]
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Andreas Noever <andreas.noever@gmail.com>
This commit is contained in:
Lukas Wunner 2016-03-20 13:57:20 +01:00 committed by Bjorn Helgaas
parent 1d111406c6
commit aae20bb6b4
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/thunderbolt/ctl.c
View File

@ -249,7 +249,7 @@ static void tb_cfg_print_error(struct tb_ctl *ctl,
* cfg_read/cfg_write. * cfg_read/cfg_write.
*/ */
tb_ctl_WARN(ctl, tb_ctl_WARN(ctl,
"CFG_ERROR(%llx:%x): Invalid config space of offset\n", "CFG_ERROR(%llx:%x): Invalid config space or offset\n",
res->response_route, res->response_port); res->response_route, res->response_port);
return; return;
case TB_CFG_ERROR_NO_SUCH_PORT: case TB_CFG_ERROR_NO_SUCH_PORT:

2
drivers/thunderbolt/eeprom.c
View File

@ -221,7 +221,7 @@ struct tb_drom_entry_port {
u8 micro1:4; u8 micro1:4;
u8 micro3; u8 micro3;
/* BYTES 5-6, TODO: verify (find hardware that has these set) */ /* BYTES 6-7, TODO: verify (find hardware that has these set) */
u8 peer_port_rid:4; u8 peer_port_rid:4;
u8 unknown3:3; u8 unknown3:3;
bool has_peer_port:1; bool has_peer_port:1;

10
drivers/thunderbolt/switch.c
View File

@ -350,7 +350,7 @@ struct tb_switch *tb_switch_alloc(struct tb *tb, u64 route)
return NULL; return NULL;
sw->tb = tb; sw->tb = tb;
if (tb_cfg_read(tb->ctl, &sw->config, route, 0, 2, 0, 5)) if (tb_cfg_read(tb->ctl, &sw->config, route, 0, TB_CFG_SWITCH, 0, 5))
goto err; goto err;
tb_info(tb, tb_info(tb,
"initializing Switch at %#llx (depth: %d, up port: %d)\n", "initializing Switch at %#llx (depth: %d, up port: %d)\n",
@ -426,9 +426,9 @@ err:
} }
/** /**
* tb_sw_set_unpplugged() - set is_unplugged on switch and downstream switches * tb_sw_set_unplugged() - set is_unplugged on switch and downstream switches
*/ */
void tb_sw_set_unpplugged(struct tb_switch *sw) void tb_sw_set_unplugged(struct tb_switch *sw)
{ {
int i; int i;
if (sw == sw->tb->root_switch) { if (sw == sw->tb->root_switch) {
@ -442,7 +442,7 @@ void tb_sw_set_unpplugged(struct tb_switch *sw)
sw->is_unplugged = true; sw->is_unplugged = true;
for (i = 0; i <= sw->config.max_port_number; i++) { for (i = 0; i <= sw->config.max_port_number; i++) {
if (!tb_is_upstream_port(&sw->ports[i]) && sw->ports[i].remote) if (!tb_is_upstream_port(&sw->ports[i]) && sw->ports[i].remote)
tb_sw_set_unpplugged(sw->ports[i].remote->sw); tb_sw_set_unplugged(sw->ports[i].remote->sw);
} }
} }
@ -484,7 +484,7 @@ int tb_switch_resume(struct tb_switch *sw)
|| tb_switch_resume(port->remote->sw)) { || tb_switch_resume(port->remote->sw)) {
tb_port_warn(port, tb_port_warn(port,
"lost during suspend, disconnecting\n"); "lost during suspend, disconnecting\n");
tb_sw_set_unpplugged(port->remote->sw); tb_sw_set_unplugged(port->remote->sw);
} }
} }
return 0; return 0;

2
drivers/thunderbolt/tb.c
View File

@ -246,7 +246,7 @@ static void tb_handle_hotplug(struct work_struct *work)
if (ev->unplug) { if (ev->unplug) {
if (port->remote) { if (port->remote) {
tb_port_info(port, "unplugged\n"); tb_port_info(port, "unplugged\n");
tb_sw_set_unpplugged(port->remote->sw); tb_sw_set_unplugged(port->remote->sw);
tb_free_invalid_tunnels(tb); tb_free_invalid_tunnels(tb);
tb_switch_free(port->remote->sw); tb_switch_free(port->remote->sw);
port->remote = NULL; port->remote = NULL;

2
drivers/thunderbolt/tb.h
View File

@ -226,7 +226,7 @@ void tb_switch_free(struct tb_switch *sw);
void tb_switch_suspend(struct tb_switch *sw); void tb_switch_suspend(struct tb_switch *sw);
int tb_switch_resume(struct tb_switch *sw); int tb_switch_resume(struct tb_switch *sw);
int tb_switch_reset(struct tb *tb, u64 route); int tb_switch_reset(struct tb *tb, u64 route);
void tb_sw_set_unpplugged(struct tb_switch *sw); void tb_sw_set_unplugged(struct tb_switch *sw);
struct tb_switch *get_switch_at_route(struct tb_switch *sw, u64 route); struct tb_switch *get_switch_at_route(struct tb_switch *sw, u64 route);
int tb_wait_for_port(struct tb_port *port, bool wait_if_unplugged); int tb_wait_for_port(struct tb_port *port, bool wait_if_unplugged);

2
drivers/thunderbolt/tb_regs.h
View File

@ -30,7 +30,7 @@ enum tb_cap {
TB_CAP_I2C = 0x0005, TB_CAP_I2C = 0x0005,
TB_CAP_PLUG_EVENTS = 0x0105, /* also EEPROM */ TB_CAP_PLUG_EVENTS = 0x0105, /* also EEPROM */
TB_CAP_TIME2 = 0x0305, TB_CAP_TIME2 = 0x0305,
TB_CAL_IECS = 0x0405, TB_CAP_IECS = 0x0405,
TB_CAP_LINK_CONTROLLER = 0x0605, /* also IECS */ TB_CAP_LINK_CONTROLLER = 0x0605, /* also IECS */
}; };