From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1efuWo-0007ul-BR for barebox@lists.infradead.org; Sun, 28 Jan 2018 21:30:20 +0000 Received: by mail-wm0-x243.google.com with SMTP id g1so10548552wmg.2 for ; Sun, 28 Jan 2018 13:30:07 -0800 (PST) From: Aleksander Morgado Date: Sun, 28 Jan 2018 22:29:59 +0100 Message-Id: <20180128212959.14319-1-aleksander@aleksander.es> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH] ratp: rename global context variable To: barebox@lists.infradead.org Cc: Aleksander Morgado 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 --- 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