mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 22:21:42 +00:00
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>
This commit is contained in:
parent
ac6c44de50
commit
05c242e9e4
@ -54,17 +54,6 @@ struct tb_ctl {
|
||||
|
||||
/* utility functions */
|
||||
|
||||
static struct tb_cfg_header make_header(u64 route)
|
||||
{
|
||||
struct tb_cfg_header header = {
|
||||
.route_hi = route >> 32,
|
||||
.route_lo = route,
|
||||
};
|
||||
/* check for overflow, route_hi is not 32 bits! */
|
||||
WARN_ON(tb_cfg_get_route(&header) != route);
|
||||
return header;
|
||||
}
|
||||
|
||||
static int check_header(struct ctl_pkg *pkg, u32 len, enum tb_cfg_pkg_type type,
|
||||
u64 route)
|
||||
{
|
||||
@ -501,7 +490,7 @@ int tb_cfg_error(struct tb_ctl *ctl, u64 route, u32 port,
|
||||
enum tb_cfg_error error)
|
||||
{
|
||||
struct cfg_error_pkg pkg = {
|
||||
.header = make_header(route),
|
||||
.header = tb_cfg_make_header(route),
|
||||
.port = port,
|
||||
.error = error,
|
||||
};
|
||||
@ -520,7 +509,7 @@ struct tb_cfg_result tb_cfg_reset(struct tb_ctl *ctl, u64 route,
|
||||
int timeout_msec)
|
||||
{
|
||||
int err;
|
||||
struct cfg_reset_pkg request = { .header = make_header(route) };
|
||||
struct cfg_reset_pkg request = { .header = tb_cfg_make_header(route) };
|
||||
struct tb_cfg_header reply;
|
||||
|
||||
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,
|
||||
{
|
||||
struct tb_cfg_result res = { 0 };
|
||||
struct cfg_read_pkg request = {
|
||||
.header = make_header(route),
|
||||
.header = tb_cfg_make_header(route),
|
||||
.addr = {
|
||||
.port = port,
|
||||
.space = space,
|
||||
@ -579,7 +568,7 @@ struct tb_cfg_result tb_cfg_write_raw(struct tb_ctl *ctl, const void *buffer,
|
||||
{
|
||||
struct tb_cfg_result res = { 0 };
|
||||
struct cfg_write_pkg request = {
|
||||
.header = make_header(route),
|
||||
.header = tb_cfg_make_header(route),
|
||||
.addr = {
|
||||
.port = port,
|
||||
.space = space,
|
||||
|
@ -43,6 +43,17 @@ static inline u64 tb_cfg_get_route(const struct tb_cfg_header *header)
|
||||
return (u64) header->route_hi << 32 | header->route_lo;
|
||||
}
|
||||
|
||||
static inline struct tb_cfg_header tb_cfg_make_header(u64 route)
|
||||
{
|
||||
struct tb_cfg_header header = {
|
||||
.route_hi = route >> 32,
|
||||
.route_lo = route,
|
||||
};
|
||||
/* check for overflow, route_hi is not 32 bits! */
|
||||
WARN_ON(tb_cfg_get_route(&header) != route);
|
||||
return header;
|
||||
}
|
||||
|
||||
int tb_cfg_error(struct tb_ctl *ctl, u64 route, u32 port,
|
||||
enum tb_cfg_error error);
|
||||
struct tb_cfg_result tb_cfg_reset(struct tb_ctl *ctl, u64 route,
|
||||
|
Loading…
Reference in New Issue
Block a user