Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bootstd: Rename bootdev checkers

Browse source 
These functions return 0 if the check passes, so the names are somewhat
confusing. Rename them.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-01-17 10:47:54 -07:00 committed by Tom Rini
parent 2b3ebf2013
commit 865328c314
8 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
boot/bootflow.c
View file

@ -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);

2
boot/bootmeth_distro.c
View file

@ -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);

2
boot/bootmeth_efi.c
View file

@ -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);

2
boot/bootmeth_efi_mgr.c
View file

@ -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);

2
boot/bootmeth_pxe.c
View file

@ -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);

2
boot/bootmeth_script.c
View file

@ -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);

12
include/bootflow.h
View file

@ -314,33 +314,33 @@ const char *bootflow_state_get_name(enum bootflow_state_t state);
void bootflow_remove(struct bootflow *bflow);
/**
* bootflow_iter_uses_blk_dev() - Check that a bootflow uses a block device
* bootflow_iter_check_blk() - Check that a bootflow uses a block device
*
* This checks the bootdev in the bootflow to make sure it uses a block device
*
* Return: 0 if OK, -ENOTSUPP if some other device is used (e.g. ethernet)
*/
int bootflow_iter_uses_blk_dev(const struct bootflow_iter *iter);
int bootflow_iter_check_blk(const struct bootflow_iter *iter);
/**
* bootflow_iter_uses_network() - Check that a bootflow uses a network device
* bootflow_iter_check_net() - Check that a bootflow uses a network device
*
* This checks the bootdev in the bootflow to make sure it uses a network
* device
*
* Return: 0 if OK, -ENOTSUPP if some other device is used (e.g. MMC)
*/
int bootflow_iter_uses_network(const struct bootflow_iter *iter);
int bootflow_iter_check_net(const struct bootflow_iter *iter);
/**
* bootflow_iter_uses_system() - Check that a bootflow uses the bootstd device
* bootflow_iter_check_system() - Check that a bootflow uses the bootstd device
*
* This checks the bootdev in the bootflow to make sure it uses the bootstd
* device
*
* Return: 0 if OK, -ENOTSUPP if some other device is used (e.g. MMC)
*/
int bootflow_iter_uses_system(const struct bootflow_iter *iter);
int bootflow_iter_check_system(const struct bootflow_iter *iter);
/**
* bootflow_menu_new() - Create a new bootflow menu

2
net/eth_bootdev.c
View file

@ -27,7 +27,7 @@ static int eth_get_bootflow(struct udevice *dev, struct bootflow_iter *iter,
int ret;
/* Must be an Ethernet device */
ret = bootflow_iter_uses_network(iter);
ret = bootflow_iter_check_net(iter);
if (ret)
return log_msg_ret("net", ret);