diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-22 12:36:40 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-31 13:57:45 +0200 |
| commit | cd8b5954c6a6e918dae96dd14ff605a819e08d51 (patch) | |
| tree | 7561aed797ac21f92eb55cbf0859b00c64e86ac6 | |
| parent | 86a5a1df39cf8dce9a685239f347284a3494aa06 (diff) | |
| download | dt-utils-cd8b5954c6a6e918dae96dd14ff605a819e08d51.tar.gz dt-utils-cd8b5954c6a6e918dae96dd14ff605a819e08d51.tar.xz | |
state: pass struct state * to storage functions
We can get a state_backend_storage * and the device * from struct state,
so pass this to the storage functions rather than the two pointers.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | src/barebox-state/backend_storage.c | 7 | ||||
| -rw-r--r-- | src/barebox-state/state.c | 2 | ||||
| -rw-r--r-- | src/barebox-state/state.h | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/barebox-state/backend_storage.c b/src/barebox-state/backend_storage.c index ee7ff06..c619b3e 100644 --- a/src/barebox-state/backend_storage.c +++ b/src/barebox-state/backend_storage.c @@ -455,7 +455,6 @@ static int state_storage_file_buckets_init(struct state_backend_storage *storage /** * state_storage_init - Init backend storage - * @param storage Storage object * @param path Path to the backend storage file * @param dev_offset Offset in the device to start writing at. * @param max_size Maximum size of the data. May be 0 for infinite. @@ -466,16 +465,16 @@ static int state_storage_file_buckets_init(struct state_backend_storage *storage * * Depending on the filetype, we create mtd buckets or normal file buckets. */ -int state_storage_init(struct state_backend_storage *storage, - struct device_d *dev, const char *path, +int state_storage_init(struct state *state, const char *path, off_t offset, size_t max_size, uint32_t stridesize, const char *storagetype) { + struct state_backend_storage *storage = &state->storage; int ret; struct mtd_info_user meminfo; INIT_LIST_HEAD(&storage->buckets); - storage->dev = dev; + storage->dev = &state->dev; storage->name = storagetype; storage->stridesize = stridesize; diff --git a/src/barebox-state/state.c b/src/barebox-state/state.c index 4484837..ec99859 100644 --- a/src/barebox-state/state.c +++ b/src/barebox-state/state.c @@ -605,7 +605,7 @@ struct state *state_new_from_node(struct device_node *node, char *path, if (ret) goto out_release_state; - ret = state_storage_init(&state->storage, &state->dev, path, offset, + ret = state_storage_init(state, path, offset, max_size, stridesize, storage_type); if (ret) goto out_release_state; diff --git a/src/barebox-state/state.h b/src/barebox-state/state.h index 254ff31..4ef4669 100644 --- a/src/barebox-state/state.h +++ b/src/barebox-state/state.h @@ -186,8 +186,7 @@ int backend_format_raw_create(struct state_backend_format **format, struct device_d *dev); int backend_format_dtb_create(struct state_backend_format **format, struct device_d *dev); -int state_storage_init(struct state_backend_storage *storage, - struct device_d *dev, const char *path, +int state_storage_init(struct state *state, const char *path, off_t offset, size_t max_size, uint32_t stridesize, const char *storagetype); void state_storage_set_readonly(struct state_backend_storage *storage); |