mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Marc Kleine-Budde <mkl@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 4/9] state: backend_raw: rename struct state_backend_raw::step -> stride
Date: Tue, 26 May 2015 13:37:48 +0200	[thread overview]
Message-ID: <1432640273-3895-5-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1432640273-3895-1-git-send-email-mkl@pengutronix.de>

This patch renames the member "step" of the struct state_backend_raw to
"stride" and tries to clarifies its meaning.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 common/state.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/state.c b/common/state.c
index 79e7f4cc6849..4dae3409049a 100644
--- a/common/state.c
+++ b/common/state.c
@@ -1032,7 +1032,7 @@ struct state_backend_raw {
 	struct state_backend backend;
 	unsigned long size_data; /* The raw data size (without magic and crc) */
 	unsigned long size_full;
-	unsigned long step; /* The step in bytes between two copies */
+	unsigned long stride; /* The stride size in bytes of the copies */
 	off_t offset; /* offset in the storage file */
 	size_t size; /* size of the storage area */
 	int num_copy_read; /* The first successfully read copy */
@@ -1120,7 +1120,7 @@ static int state_backend_raw_load(struct state_backend *backend,
 		return fd;
 
 	for (i = 0; i < RAW_BACKEND_COPIES; i++) {
-		off_t offset = backend_raw->offset + i * backend_raw->step;
+		off_t offset = backend_raw->offset + i * backend_raw->stride;
 
 		ret = backend_raw_load_one(backend_raw, state, fd, offset);
 		if (!ret) {
@@ -1140,7 +1140,7 @@ static int backend_raw_write_one(struct state_backend_raw *backend_raw,
 		struct state *state, int fd, int num, void *buf, size_t size)
 {
 	int ret;
-	off_t offset = backend_raw->offset + num * backend_raw->step;
+	off_t offset = backend_raw->offset + num * backend_raw->stride;
 
 	dev_dbg(&state->dev, "%s: 0x%08lx 0x%08zx\n",
 			__func__, offset, size);
@@ -1277,15 +1277,15 @@ int state_backend_raw_file(struct state *state, const char *of_path,
 	ret = mtd_get_meminfo(backend->path, &meminfo);
 	if (!ret && !(meminfo.flags & MTD_NO_ERASE)) {
 		backend_raw->need_erase = true;
-		backend_raw->step = ALIGN(backend_raw->size_full,
-					  meminfo.erasesize);
+		backend_raw->stride = ALIGN(backend_raw->size_full,
+					    meminfo.erasesize);
 		dev_dbg(&state->dev, "is a mtd, adjust stepsize to %ld\n",
-			backend_raw->step);
+			backend_raw->stride);
 	} else {
-		backend_raw->step = backend_raw->size_full;
+		backend_raw->stride = backend_raw->size_full;
 	}
 
-	if (backend_raw->size / backend_raw->step < RAW_BACKEND_COPIES) {
+	if (backend_raw->size / backend_raw->stride < RAW_BACKEND_COPIES) {
 		dev_err(&state->dev, "not enough space for two copies\n");
 		ret = -ENOSPC;
 		goto err;
-- 
2.1.4


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

  parent reply	other threads:[~2015-05-26 11:38 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-26 11:37 [PATCH 0/9] state: updates and cleanups to make code better sharable with linux Marc Kleine-Budde
2015-05-26 11:37 ` [PATCH 1/9] state: mtd_get_meminfo: open path readonly instead of readwrite Marc Kleine-Budde
2015-05-26 11:37 ` [PATCH 2/9] state: mtd_get_meminfo: make usage of mtd's meminfo compatible to linux Marc Kleine-Budde
2015-05-26 11:37 ` [PATCH 3/9] state: backend_raw: remove hard coded limit of two copies Marc Kleine-Budde
2015-05-26 11:37 ` Marc Kleine-Budde [this message]
2015-05-26 11:37 ` [PATCH 5/9] state: backend_raw: properly align write and erase size Marc Kleine-Budde
2015-05-26 11:37 ` [PATCH 6/9] state: backend_raw: factor out state_backend_raw_file_get_size() into separate function Marc Kleine-Budde
2015-05-26 11:37 ` [PATCH 7/9] state: backend_raw: rename backend_raw_write_one() -> backend_raw_save_one() Marc Kleine-Budde
2015-05-26 11:37 ` [PATCH 8/9] state: backend_raw: add sanity check of data_len during load Marc Kleine-Budde
2015-05-26 11:37 ` [PATCH 9/9] state: backend_raw: update documentation of struct state_backend_raw members Marc Kleine-Budde
2015-05-26 12:33 ` [PATCH 0/9] state: updates and cleanups to make code better sharable with linux 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=1432640273-3895-5-git-send-email-mkl@pengutronix.de \
    --to=mkl@pengutronix.de \
    --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