[PATCH 4/9] state: backend_raw: rename struct state_backend_raw::step -> stride
Marc Kleine-Budde
mkl at pengutronix.de
Tue May 26 04:37:48 PDT 2015
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 at 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
More information about the barebox
mailing list