From: Steven Rostedt <rostedt@goodmis.org>
To: linux-trace-devel@vger.kernel.org
Subject: [PATCH 2/2] trace-cmd: Make tracecmd_unpair_peer() return void
Date: Mon, 13 Apr 2020 16:53:48 -0400 [thread overview]
Message-ID: <20200413205521.400302580@goodmis.org> (raw)
In-Reply-To: 20200413205346.028742220@goodmis.org
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
The return value of tracecmd_unpair_peer() is useless. Just make it a void
function call.
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
include/trace-cmd/trace-cmd.h | 2 +-
lib/trace-cmd/trace-input.c | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h
index 76fcffaea235..f3c95f3087a2 100644
--- a/include/trace-cmd/trace-cmd.h
+++ b/include/trace-cmd/trace-cmd.h
@@ -147,7 +147,7 @@ struct tracecmd_input *tracecmd_open_head(const char *file);
struct tracecmd_input *tracecmd_open_fd(int fd);
int tracecmd_pair_peer(struct tracecmd_input *handle,
struct tracecmd_input *peer);
-int tracecmd_unpair_peer(struct tracecmd_input *handle);
+void tracecmd_unpair_peer(struct tracecmd_input *handle);
void tracecmd_ref(struct tracecmd_input *handle);
void tracecmd_close(struct tracecmd_input *handle);
int tracecmd_read_headers(struct tracecmd_input *handle);
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index 50d52f49a8f0..55c3d80a6057 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -3245,18 +3245,16 @@ fail:
*
* This removes any peer that is linked to the @handle.
*/
-int tracecmd_unpair_peer(struct tracecmd_input *handle)
+void tracecmd_unpair_peer(struct tracecmd_input *handle)
{
if (!handle)
- return -1;
+ return;
if (handle->host.peer_data) {
tracecmd_close(handle->host.peer_data);
handle->host.peer_data = NULL;
tsync_check_enable(handle);
}
-
- return 0;
}
/**
--
2.25.1
next prev parent reply other threads:[~2020-04-13 20:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-13 20:53 [PATCH 0/2] trace-cmd: Minor updates to tracecmd_unpair_peer() function Steven Rostedt
2020-04-13 20:53 ` [PATCH 1/2] trace-cmd: Fix cut and paste header comment of tracecmd_unpair_peer() Steven Rostedt
2020-04-13 20:53 ` Steven Rostedt [this message]
2020-04-14 14:15 ` [PATCH 0/2] trace-cmd: Minor updates to tracecmd_unpair_peer() function Tzvetomir Stoyanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200413205521.400302580@goodmis.org \
--to=rostedt@goodmis.org \
--cc=linux-trace-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).