summaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2023-01-17 10:47:54 -0700
committerTom Rini <trini@konsulko.com>2023-01-23 18:11:40 -0500
commit865328c3147b013021b1e48641ca11cef96f88cd (patch)
tree1c8212722614961deb84d532f1f39e2b9c4e5247 /boot
parent2b3ebf2013d808fc02df0fecf7eb22a6dfaffeb5 (diff)
bootstd: Rename bootdev checkers
These functions return 0 if the check passes, so the names are somewhat confusing. Rename them. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'boot')
-rw-r--r--boot/bootflow.c6
-rw-r--r--boot/bootmeth_distro.c2
-rw-r--r--boot/bootmeth_efi.c2
-rw-r--r--boot/bootmeth_efi_mgr.c2
-rw-r--r--boot/bootmeth_pxe.c2
-rw-r--r--boot/bootmeth_script.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/boot/bootflow.c b/boot/bootflow.c
index 163cd4953d..0345755f58 100644
--- a/boot/bootflow.c
+++ b/boot/bootflow.c
@@ -427,7 +427,7 @@ int bootflow_run_boot(struct bootflow_iter *iter, struct bootflow *bflow)
return ret;
}
-int bootflow_iter_uses_blk_dev(const struct bootflow_iter *iter)
+int bootflow_iter_check_blk(const struct bootflow_iter *iter)
{
const struct udevice *media = dev_get_parent(iter->dev);
enum uclass_id id = device_get_uclass_id(media);
@@ -439,7 +439,7 @@ int bootflow_iter_uses_blk_dev(const struct bootflow_iter *iter)
return -ENOTSUPP;
}
-int bootflow_iter_uses_network(const struct bootflow_iter *iter)
+int bootflow_iter_check_net(const struct bootflow_iter *iter)
{
const struct udevice *media = dev_get_parent(iter->dev);
enum uclass_id id = device_get_uclass_id(media);
@@ -451,7 +451,7 @@ int bootflow_iter_uses_network(const struct bootflow_iter *iter)
return -ENOTSUPP;
}
-int bootflow_iter_uses_system(const struct bootflow_iter *iter)
+int bootflow_iter_check_system(const struct bootflow_iter *iter)
{
const struct udevice *media = dev_get_parent(iter->dev);
enum uclass_id id = device_get_uclass_id(media);
diff --git a/boot/bootmeth_distro.c b/boot/bootmeth_distro.c
index 6ef0fa1f2c..356929828b 100644
--- a/boot/bootmeth_distro.c
+++ b/boot/bootmeth_distro.c
@@ -59,7 +59,7 @@ static int distro_check(struct udevice *dev, struct bootflow_iter *iter)
int ret;
/* This only works on block devices */
- ret = bootflow_iter_uses_blk_dev(iter);
+ ret = bootflow_iter_check_blk(iter);
if (ret)
return log_msg_ret("blk", ret);
diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c
index d5438eb67b..f7bb153d9d 100644
--- a/boot/bootmeth_efi.c
+++ b/boot/bootmeth_efi.c
@@ -104,7 +104,7 @@ static int distro_efi_check(struct udevice *dev, struct bootflow_iter *iter)
int ret;
/* This only works on block devices */
- ret = bootflow_iter_uses_blk_dev(iter);
+ ret = bootflow_iter_check_blk(iter);
if (ret)
return log_msg_ret("blk", ret);
diff --git a/boot/bootmeth_efi_mgr.c b/boot/bootmeth_efi_mgr.c
index 2f327c1f8c..e9d973429f 100644
--- a/boot/bootmeth_efi_mgr.c
+++ b/boot/bootmeth_efi_mgr.c
@@ -36,7 +36,7 @@ static int efi_mgr_check(struct udevice *dev, struct bootflow_iter *iter)
int ret;
/* Must be an bootstd device */
- ret = bootflow_iter_uses_system(iter);
+ ret = bootflow_iter_check_system(iter);
if (ret)
return log_msg_ret("net", ret);
diff --git a/boot/bootmeth_pxe.c b/boot/bootmeth_pxe.c
index e6992168c0..13e2ff486d 100644
--- a/boot/bootmeth_pxe.c
+++ b/boot/bootmeth_pxe.c
@@ -44,7 +44,7 @@ static int distro_pxe_check(struct udevice *dev, struct bootflow_iter *iter)
int ret;
/* This only works on network devices */
- ret = bootflow_iter_uses_network(iter);
+ ret = bootflow_iter_check_net(iter);
if (ret)
return log_msg_ret("net", ret);
diff --git a/boot/bootmeth_script.c b/boot/bootmeth_script.c
index c7061eb998..3a3907d75b 100644
--- a/boot/bootmeth_script.c
+++ b/boot/bootmeth_script.c
@@ -28,7 +28,7 @@ static int script_check(struct udevice *dev, struct bootflow_iter *iter)
int ret;
/* This only works on block devices */
- ret = bootflow_iter_uses_blk_dev(iter);
+ ret = bootflow_iter_check_blk(iter);
if (ret)
return log_msg_ret("blk", ret);