lkml.org 
[lkml]   [2020]   [Jan]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC v5 06/57] objtool: Give ORC functions consistent name
    Date
    Rename ORC manipulating functions to have more consistent name. Have
    "orc_" as a prefix for all of them.

    No functionality change.

    Suggested-by: Josh Poimboeuf <jpoimboe@redhat.com>
    Signed-off-by: Julien Thierry <jthierry@redhat.com>
    ---
    tools/objtool/check.c | 4 ++--
    tools/objtool/orc.h | 4 ++--
    tools/objtool/orc_gen.c | 14 +++++++-------
    3 files changed, 11 insertions(+), 11 deletions(-)

    diff --git a/tools/objtool/check.c b/tools/objtool/check.c
    index 6a5f78cca27c..dd155095251c 100644
    --- a/tools/objtool/check.c
    +++ b/tools/objtool/check.c
    @@ -2481,11 +2481,11 @@ int check(const char *_objname, bool orc)
    }

    if (orc) {
    - ret = create_orc(&file);
    + ret = orc_init(&file);
    if (ret < 0)
    goto out;

    - ret = create_orc_sections(&file);
    + ret = orc_create_sections(&file);
    if (ret < 0)
    goto out;

    diff --git a/tools/objtool/orc.h b/tools/objtool/orc.h
    index ee2832221e62..cd44417487e4 100644
    --- a/tools/objtool/orc.h
    +++ b/tools/objtool/orc.h
    @@ -10,8 +10,8 @@

    struct objtool_file;

    -int create_orc(struct objtool_file *file);
    -int create_orc_sections(struct objtool_file *file);
    +int orc_init(struct objtool_file *file);
    +int orc_create_sections(struct objtool_file *file);

    int orc_dump(const char *objname);

    diff --git a/tools/objtool/orc_gen.c b/tools/objtool/orc_gen.c
    index 27a4112848c2..29bee7bd212a 100644
    --- a/tools/objtool/orc_gen.c
    +++ b/tools/objtool/orc_gen.c
    @@ -10,7 +10,7 @@
    #include "check.h"
    #include "warn.h"

    -int create_orc(struct objtool_file *file)
    +int orc_init(struct objtool_file *file)
    {
    struct instruction *insn;

    @@ -81,9 +81,9 @@ int create_orc(struct objtool_file *file)
    return 0;
    }

    -static int create_orc_entry(struct section *u_sec, struct section *ip_relasec,
    - unsigned int idx, struct section *insn_sec,
    - unsigned long insn_off, struct orc_entry *o)
    +static int orc_create_entry(struct section *u_sec, struct section *ip_relasec,
    + unsigned int idx, struct section *insn_sec,
    + unsigned long insn_off, struct orc_entry *o)
    {
    struct orc_entry *orc;
    struct rela *rela;
    @@ -116,7 +116,7 @@ static int create_orc_entry(struct section *u_sec, struct section *ip_relasec,
    return 0;
    }

    -int create_orc_sections(struct objtool_file *file)
    +int orc_create_sections(struct objtool_file *file)
    {
    struct instruction *insn, *prev_insn;
    struct section *sec, *u_sec, *ip_relasec;
    @@ -182,7 +182,7 @@ int create_orc_sections(struct objtool_file *file)
    if (!prev_insn || memcmp(&insn->orc, &prev_insn->orc,
    sizeof(struct orc_entry))) {

    - if (create_orc_entry(u_sec, ip_relasec, idx,
    + if (orc_create_entry(u_sec, ip_relasec, idx,
    insn->sec, insn->offset,
    &insn->orc))
    return -1;
    @@ -194,7 +194,7 @@ int create_orc_sections(struct objtool_file *file)

    /* section terminator */
    if (prev_insn) {
    - if (create_orc_entry(u_sec, ip_relasec, idx,
    + if (orc_create_entry(u_sec, ip_relasec, idx,
    prev_insn->sec,
    prev_insn->offset + prev_insn->len,
    &empty))
    --
    2.21.0
    \
     
     \ /
      Last update: 2020-01-09 17:04    [W:8.172 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site