mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Aleksander Morgado <aleksander@aleksander.es>
To: barebox@lists.infradead.org
Cc: Aleksander Morgado <aleksander@aleksander.es>
Subject: [PATCH] ratp: rename global context variable
Date: Sun, 28 Jan 2018 22:29:59 +0100	[thread overview]
Message-ID: <20180128212959.14319-1-aleksander@aleksander.es> (raw)

The 'ratp_command_ctx' seems to specify that this variable is only
used to process command operations, but it really is used in every
async operation (e.g. also in FS), so just rename it to a more generic
name for clarity.

Signed-off-by: Aleksander Morgado <aleksander@aleksander.es>
---
 common/ratp.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/ratp.c b/common/ratp.c
index 7be86d49a..c5eae2e2c 100644
--- a/common/ratp.c
+++ b/common/ratp.c
@@ -204,7 +204,7 @@ static int ratp_bb_send_getenv_return(struct ratp_ctx *ctx, const char *val)
 }
 
 static char *ratp_command;
-static struct ratp_ctx *ratp_command_ctx;
+static struct ratp_ctx *ratp_ctx;
 
 static int ratp_bb_dispatch(struct ratp_ctx *ctx, const void *buf, int len)
 {
@@ -220,7 +220,7 @@ static int ratp_bb_dispatch(struct ratp_ctx *ctx, const void *buf, int len)
 			return 0;
 
 		ratp_command = xmemdup_add_zero(&rbb->data, dlen);
-		ratp_command_ctx = ctx;
+		ratp_ctx = ctx;
 		pr_debug("got command: %s\n", ratp_command);
 
 		break;
@@ -337,7 +337,7 @@ void ratp_run_command(void)
 	free(ratp_command);
 	ratp_command = NULL;
 
-	ratp_bb_send_command_return(ratp_command_ctx, ret);
+	ratp_bb_send_command_return(ratp_ctx, ret);
 }
 
 static const char *ratpfs_mount_path;
@@ -400,7 +400,7 @@ out:
 
 int barebox_ratp_fs_call(struct ratp_bb_pkt *tx, struct ratp_bb_pkt **rx)
 {
-	struct ratp_ctx *ctx = ratp_command_ctx;
+	struct ratp_ctx *ctx = ratp_ctx;
 	struct ratp_bb *rbb;
 	int len;
 	u64 start;
@@ -446,11 +446,11 @@ int barebox_ratp(struct console_device *cdev)
 	if (!cdev->getc || !cdev->putc)
 		return -EINVAL;
 
-	if (ratp_command_ctx) {
-		ctx = ratp_command_ctx;
+	if (ratp_ctx) {
+		ctx = ratp_ctx;
 	} else {
 		ctx = xzalloc(sizeof(*ctx));
-		ratp_command_ctx = ctx;
+		ratp_ctx = ctx;
 		ctx->ratp.send = console_send;
 		ctx->ratp.recv = console_recv;
 		ctx->console_recv_fifo = kfifo_alloc(512);
@@ -494,7 +494,7 @@ out:
 
 static void barebox_ratp_close(void)
 {
-	if (ratp_command_ctx && ratp_command_ctx->cdev)
-		ratp_console_unregister(ratp_command_ctx);
+	if (ratp_ctx && ratp_ctx->cdev)
+		ratp_console_unregister(ratp_ctx);
 }
 predevshutdown_exitcall(barebox_ratp_close);
-- 
2.15.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2018-01-28 21:30 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-28 21:29 Aleksander Morgado [this message]
2018-01-30  6:57 ` Sascha Hauer

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=20180128212959.14319-1-aleksander@aleksander.es \
    --to=aleksander@aleksander.es \
    --cc=barebox@lists.infradead.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