mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Aleksander Morgado <aleksander@aleksander.es>
To: barebox@lists.infradead.org
Cc: andrew.smirnov@gmail.com, Aleksander Morgado <aleksander@aleksander.es>
Subject: [PATCH v2 6/7] ratp: use pr_ macros to print messages
Date: Wed, 12 Sep 2018 15:45:49 +0200	[thread overview]
Message-ID: <20180912134550.3970-7-aleksander@aleksander.es> (raw)
In-Reply-To: <20180912134550.3970-1-aleksander@aleksander.es>

Following suggestions in other patch reviews, the RAPT commands are
updated to use pr_err() instead of plain printf() to report errors
to the user.

Signed-off-by: Aleksander Morgado <aleksander@aleksander.es>
---
 common/ratp/md.c    | 12 +++++++-----
 common/ratp/mw.c    | 14 ++++++++------
 common/ratp/reset.c |  6 ++++--
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/common/ratp/md.c b/common/ratp/md.c
index 5b877947c..2e5a956cb 100644
--- a/common/ratp/md.c
+++ b/common/ratp/md.c
@@ -15,6 +15,8 @@
  *
  */
 
+#define pr_fmt(fmt) "barebox-ratp: md: " fmt
+
 #include <common.h>
 #include <ratp_bb.h>
 #include <init.h>
@@ -121,7 +123,7 @@ static int ratp_cmd_md(const struct ratp_bb *req, int req_len,
 
 	/* At least message header should be valid */
 	if (req_len < sizeof(*md_req)) {
-		printf("ratp md ignored: size mismatch (%d < %zu)\n",
+		pr_err("ignored: size mismatch (%d < %zu)\n",
 		       req_len, sizeof (*md_req));
 		ret = -EINVAL;
 		goto out;
@@ -130,7 +132,7 @@ static int ratp_cmd_md(const struct ratp_bb *req, int req_len,
 	/* Validate buffer position and size */
 	buffer_offset = be16_to_cpu(md_req->buffer_offset);
 	if (req_len < buffer_offset) {
-		printf("ratp md ignored: invalid buffer offset (%d < %hu)\n",
+		pr_err("ignored: invalid buffer offset (%d < %hu)\n",
 		       req_len, buffer_offset);
 		ret = -EINVAL;
 		goto out;
@@ -141,20 +143,20 @@ static int ratp_cmd_md(const struct ratp_bb *req, int req_len,
 	/* Validate path position and size */
 	path_offset = be16_to_cpu(md_req->path_offset);
 	if (path_offset != 0) {
-		printf("ratp md ignored: invalid path offset\n");
+		pr_err("ignored: invalid path offset\n");
 		ret = -EINVAL;
 		goto out;
 	}
 	path_size = be16_to_cpu(md_req->path_size);
 	if (!path_size) {
-		printf("ratp md ignored: no filepath given\n");
+		pr_err("ignored: no filepath given\n");
 		ret = -EINVAL;
 		goto out;
 	}
 
 	/* Validate buffer size */
 	if (buffer_size < path_size) {
-		printf("ratp mw ignored: size mismatch (%d < %hu): path may not be fully given\n",
+		pr_err("ignored: size mismatch (%d < %hu): path may not be fully given\n",
 		       req_len, path_size);
 		ret = -EINVAL;
 		goto out;
diff --git a/common/ratp/mw.c b/common/ratp/mw.c
index 3234d7dac..0579da3c1 100644
--- a/common/ratp/mw.c
+++ b/common/ratp/mw.c
@@ -16,6 +16,8 @@
  *
  */
 
+#define pr_fmt(fmt) "barebox-ratp: mw: " fmt
+
 #include <common.h>
 #include <ratp_bb.h>
 #include <init.h>
@@ -77,7 +79,7 @@ static int ratp_cmd_mw(const struct ratp_bb *req, int req_len,
 
 	/* At least message header should be valid */
 	if (req_len < sizeof(*mw_req)) {
-		printf("ratp mw ignored: size mismatch (%d < %zu)\n",
+		pr_err("ignored: size mismatch (%d < %zu)\n",
 		       req_len, sizeof (*mw_req));
 		ret = -EINVAL;
 		goto out;
@@ -86,7 +88,7 @@ static int ratp_cmd_mw(const struct ratp_bb *req, int req_len,
 	/* Validate buffer position and size */
 	buffer_offset = be16_to_cpu(mw_req->buffer_offset);
 	if (req_len < buffer_offset) {
-		printf("ratp mw ignored: invalid buffer offset (%d < %hu)\n",
+		pr_err("ignored: invalid buffer offset (%d < %hu)\n",
 		       req_len, buffer_offset);
 		ret = -EINVAL;
 		goto out;
@@ -97,13 +99,13 @@ static int ratp_cmd_mw(const struct ratp_bb *req, int req_len,
 	/* Validate path position and size */
 	path_offset = be16_to_cpu(mw_req->path_offset);
 	if (path_offset != 0) {
-		printf("ratp mw ignored: invalid path offset\n");
+		pr_err("ignored: invalid path offset\n");
 		ret = -EINVAL;
 		goto out;
 	}
 	path_size = be16_to_cpu(mw_req->path_size);
 	if (!path_size) {
-		printf("ratp mw ignored: no filepath given\n");
+		pr_err("ignored: no filepath given\n");
 		ret = -EINVAL;
 		goto out;
 	}
@@ -111,7 +113,7 @@ static int ratp_cmd_mw(const struct ratp_bb *req, int req_len,
 	/* Validate data position and size */
 	data_offset = be16_to_cpu(mw_req->data_offset);
 	if (data_offset != (path_offset + path_size)) {
-		printf("ratp mw ignored: invalid path offset\n");
+		pr_err("ignored: invalid path offset\n");
 		ret = -EINVAL;
 		goto out;
 	}
@@ -123,7 +125,7 @@ static int ratp_cmd_mw(const struct ratp_bb *req, int req_len,
 
 	/* Validate buffer size */
 	if (buffer_size < (path_size + data_size)) {
-		printf("ratp mw ignored: size mismatch (%d < %hu): path or data not be fully given\n",
+		pr_err("ignored: size mismatch (%d < %hu): path or data not be fully given\n",
 		       req_len, path_size + data_size);
 		ret = -EINVAL;
 		goto out;
diff --git a/common/ratp/reset.c b/common/ratp/reset.c
index 60b6ff536..5439f344f 100644
--- a/common/ratp/reset.c
+++ b/common/ratp/reset.c
@@ -17,6 +17,8 @@
  *
  */
 
+#define pr_fmt(fmt) "barebox-ratp: reset: " fmt
+
 #include <common.h>
 #include <command.h>
 #include <ratp_bb.h>
@@ -35,11 +37,11 @@ static int ratp_cmd_reset(const struct ratp_bb *req, int req_len,
 	struct ratp_bb_reset *reset_req = (struct ratp_bb_reset *)req;
 
 	if (req_len < sizeof (*reset_req)) {
-		printf ("ratp reset ignored: size mismatch (%d < %zu)\n", req_len, sizeof (*reset_req));
+		pr_err("ignored: size mismatch (%d < %zu)\n", req_len, sizeof (*reset_req));
 		return 2;
 	}
 
-	debug("running reset %s\n", reset_req->force ? "(forced)" : "");
+	pr_debug("running %s\n", reset_req->force ? "(forced)" : "");
 
 	if (!reset_req->force)
 		shutdown_barebox();
-- 
2.19.0


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

  parent reply	other threads:[~2018-09-12 13:46 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-12 13:45 [PATCH v2 0/7] RATP i2c and GPIO support Aleksander Morgado
2018-09-12 13:45 ` [PATCH v2 1/7] ratp: implement i2c read/write support Aleksander Morgado
2018-09-12 13:45 ` [PATCH v2 2/7] bbremote: " Aleksander Morgado
2018-09-12 13:45 ` [PATCH v2 3/7] ratp: implement support for GPIO commands Aleksander Morgado
2018-09-12 13:45 ` [PATCH v2 4/7] bbremote: implement support for GPIO operations Aleksander Morgado
2018-09-12 13:45 ` [PATCH v2 5/7] ratp: use __packed instead of the full form Aleksander Morgado
2018-09-12 13:45 ` Aleksander Morgado [this message]
2018-09-12 13:45 ` [PATCH v2 7/7] ratp: fix incorrect whitespaces in method calls Aleksander Morgado
2018-09-17  7:50 ` [PATCH v2 0/7] RATP i2c and GPIO support 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=20180912134550.3970-7-aleksander@aleksander.es \
    --to=aleksander@aleksander.es \
    --cc=andrew.smirnov@gmail.com \
    --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