summaryrefslogtreecommitdiffstats
path: root/common/state
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2017-07-31 20:21:01 +0200
committerLucas Stach <l.stach@pengutronix.de>2017-07-31 20:21:01 +0200
commitd6d7441e90d7859c60cba8b9bc160d7d24692452 (patch)
tree31337dbe64d7006b5a1a399879c1915819041140 /common/state
parentfcad2a76f7981320ef14592599c7955e985c264d (diff)
parent69d50079bb0bf5cc6db2c3376fec691208b25c40 (diff)
downloadbarebox-d6d7441e90d7859c60cba8b9bc160d7d24692452.tar.gz
Merge branch 'for-next/efi'
Diffstat (limited to 'common/state')
-rw-r--r--common/state/backend_format_dtb.c2
-rw-r--r--common/state/backend_format_raw.c2
-rw-r--r--common/state/backend_storage.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/common/state/backend_format_dtb.c b/common/state/backend_format_dtb.c
index e88cda4..4c9d2ee 100644
--- a/common/state/backend_format_dtb.c
+++ b/common/state/backend_format_dtb.c
@@ -49,7 +49,7 @@ static int state_backend_format_dtb_verify(struct state_backend_format *format,
size_t len = *lenp;
if (dtb_len > len) {
- dev_err(fdtb->dev, "Error, stored DTB length (%d) longer than read buffer (%d)\n",
+ dev_err(fdtb->dev, "Error, stored DTB length (%zd) longer than read buffer (%zd)\n",
dtb_len, len);
return -EINVAL;
}
diff --git a/common/state/backend_format_raw.c b/common/state/backend_format_raw.c
index d76718c..2ba97e0 100644
--- a/common/state/backend_format_raw.c
+++ b/common/state/backend_format_raw.c
@@ -108,7 +108,7 @@ static int backend_format_raw_verify(struct state_backend_format *format,
ssize_t complete_len;
if (len < format_raw_min_length) {
- dev_err(backend_raw->dev, "Error, buffer length (%d) is shorter than the minimum required header length\n",
+ dev_err(backend_raw->dev, "Error, buffer length (%zd) is shorter than the minimum required header length\n",
len);
return -EINVAL;
}
diff --git a/common/state/backend_storage.c b/common/state/backend_storage.c
index 3249d0b..d2d1778 100644
--- a/common/state/backend_storage.c
+++ b/common/state/backend_storage.c
@@ -247,7 +247,7 @@ static int state_storage_mtd_buckets_init(struct state_backend_storage *storage,
end = meminfo->size;
if (!IS_ALIGNED(storage->offset, meminfo->erasesize)) {
- dev_err(storage->dev, "Offset within the device is not aligned to eraseblocks. Offset is %ld, erasesize %zu\n",
+ dev_err(storage->dev, "Offset within the device is not aligned to eraseblocks. Offset is %ld, erasesize %u\n",
storage->offset, meminfo->erasesize);
return -EINVAL;
}