diff options
author | Mika Westerberg <mika.westerberg@linux.intel.com> | 2017-06-06 08:25:08 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-09 05:42:42 -0400 |
commit | 05c242e9e47d210ed6cbef31f2c441fa6ee325c6 (patch) | |
tree | cba31cc1c745b6f363c3a1cefca3bf90d0e93cec /drivers/thunderbolt/ctl.c | |
parent | ac6c44de503e51f0eb757e5321724846525cb29f (diff) |
thunderbolt: Expose make_header() to other files
We will be using this function in files introduced in subsequent
patches. While there the function is renamed to tb_cfg_make_header()
following tb_cfg_get_route().
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Yehezkel Bernat <yehezkel.bernat@intel.com>
Reviewed-by: Michael Jamet <michael.jamet@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Andreas Noever <andreas.noever@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/thunderbolt/ctl.c')
-rw-r--r-- | drivers/thunderbolt/ctl.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/drivers/thunderbolt/ctl.c b/drivers/thunderbolt/ctl.c index 8352ee8662aa..c6633da582b8 100644 --- a/drivers/thunderbolt/ctl.c +++ b/drivers/thunderbolt/ctl.c | |||
@@ -54,17 +54,6 @@ struct tb_ctl { | |||
54 | 54 | ||
55 | /* utility functions */ | 55 | /* utility functions */ |
56 | 56 | ||
57 | static struct tb_cfg_header make_header(u64 route) | ||
58 | { | ||
59 | struct tb_cfg_header header = { | ||
60 | .route_hi = route >> 32, | ||
61 | .route_lo = route, | ||
62 | }; | ||
63 | /* check for overflow, route_hi is not 32 bits! */ | ||
64 | WARN_ON(tb_cfg_get_route(&header) != route); | ||
65 | return header; | ||
66 | } | ||
67 | |||
68 | static int check_header(struct ctl_pkg *pkg, u32 len, enum tb_cfg_pkg_type type, | 57 | static int check_header(struct ctl_pkg *pkg, u32 len, enum tb_cfg_pkg_type type, |
69 | u64 route) | 58 | u64 route) |
70 | { | 59 | { |
@@ -501,7 +490,7 @@ int tb_cfg_error(struct tb_ctl *ctl, u64 route, u32 port, | |||
501 | enum tb_cfg_error error) | 490 | enum tb_cfg_error error) |
502 | { | 491 | { |
503 | struct cfg_error_pkg pkg = { | 492 | struct cfg_error_pkg pkg = { |
504 | .header = make_header(route), | 493 | .header = tb_cfg_make_header(route), |
505 | .port = port, | 494 | .port = port, |
506 | .error = error, | 495 | .error = error, |
507 | }; | 496 | }; |
@@ -520,7 +509,7 @@ struct tb_cfg_result tb_cfg_reset(struct tb_ctl *ctl, u64 route, | |||
520 | int timeout_msec) | 509 | int timeout_msec) |
521 | { | 510 | { |
522 | int err; | 511 | int err; |
523 | struct cfg_reset_pkg request = { .header = make_header(route) }; | 512 | struct cfg_reset_pkg request = { .header = tb_cfg_make_header(route) }; |
524 | struct tb_cfg_header reply; | 513 | struct tb_cfg_header reply; |
525 | 514 | ||
526 | err = tb_ctl_tx(ctl, &request, sizeof(request), TB_CFG_PKG_RESET); | 515 | err = tb_ctl_tx(ctl, &request, sizeof(request), TB_CFG_PKG_RESET); |
@@ -542,7 +531,7 @@ struct tb_cfg_result tb_cfg_read_raw(struct tb_ctl *ctl, void *buffer, | |||
542 | { | 531 | { |
543 | struct tb_cfg_result res = { 0 }; | 532 | struct tb_cfg_result res = { 0 }; |
544 | struct cfg_read_pkg request = { | 533 | struct cfg_read_pkg request = { |
545 | .header = make_header(route), | 534 | .header = tb_cfg_make_header(route), |
546 | .addr = { | 535 | .addr = { |
547 | .port = port, | 536 | .port = port, |
548 | .space = space, | 537 | .space = space, |
@@ -579,7 +568,7 @@ struct tb_cfg_result tb_cfg_write_raw(struct tb_ctl *ctl, const void *buffer, | |||
579 | { | 568 | { |
580 | struct tb_cfg_result res = { 0 }; | 569 | struct tb_cfg_result res = { 0 }; |
581 | struct cfg_write_pkg request = { | 570 | struct cfg_write_pkg request = { |
582 | .header = make_header(route), | 571 | .header = tb_cfg_make_header(route), |
583 | .addr = { | 572 | .addr = { |
584 | .port = port, | 573 | .port = port, |
585 | .space = space, | 574 | .space = space, |