lkml.org 
[lkml]   [2017]   [May]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 16/27] thunderbolt: Expose make_header() to other files
    Date
    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>
    ---
    drivers/thunderbolt/ctl.c | 19 ++++---------------
    drivers/thunderbolt/ctl.h | 11 +++++++++++
    2 files changed, 15 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 {

    /* 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,
    diff --git a/drivers/thunderbolt/ctl.h b/drivers/thunderbolt/ctl.h
    index 9812b1c86d4f..914da86ec77d 100644
    --- a/drivers/thunderbolt/ctl.h
    +++ b/drivers/thunderbolt/ctl.h
    @@ -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,
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-05-26 18:17    [W:2.268 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site