diff options
| -rw-r--r-- | boot/bootflow.c | 4 | ||||
| -rw-r--r-- | drivers/mmc/mmc_bootdev.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/scsi_bootdev.c | 2 | ||||
| -rw-r--r-- | drivers/usb/host/usb_bootdev.c | 2 | ||||
| -rw-r--r-- | fs/sandbox/host_bootdev.c | 2 | ||||
| -rw-r--r-- | include/bootdev.h | 2 | ||||
| -rw-r--r-- | include/bootflow.h | 2 | ||||
| -rw-r--r-- | net/eth_bootdev.c | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/boot/bootflow.c b/boot/bootflow.c index 8f2cb876bb..487552fa28 100644 --- a/boot/bootflow.c +++ b/boot/bootflow.c @@ -315,14 +315,14 @@ static int bootflow_check(struct bootflow_iter *iter, struct bootflow *bflow) /* If we got a valid bootflow, return it */ if (!ret) { - log_debug("Bootdevice '%s' part %d method '%s': Found bootflow\n", + log_debug("Bootdev '%s' part %d method '%s': Found bootflow\n", dev->name, iter->part, iter->method->name); return 0; } /* Unless there is nothing more to try, move to the next device */ else if (ret != BF_NO_MORE_PARTS && ret != -ENOSYS) { - log_debug("Bootdevice '%s' part %d method '%s': Error %d\n", + log_debug("Bootdev '%s' part %d method '%s': Error %d\n", dev->name, iter->part, iter->method->name, ret); /* * For 'all' we return all bootflows, even diff --git a/drivers/mmc/mmc_bootdev.c b/drivers/mmc/mmc_bootdev.c index b57b8a6227..55ecead2dd 100644 --- a/drivers/mmc/mmc_bootdev.c +++ b/drivers/mmc/mmc_bootdev.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Bootdevice for MMC + * Bootdev for MMC * * Copyright 2021 Google LLC * Written by Simon Glass <sjg@chromium.org> diff --git a/drivers/scsi/scsi_bootdev.c b/drivers/scsi/scsi_bootdev.c index 991013fe1e..218221fa30 100644 --- a/drivers/scsi/scsi_bootdev.c +++ b/drivers/scsi/scsi_bootdev.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Bootdevice for USB + * Bootdev for SCSI * * Copyright 2021 Google LLC * Written by Simon Glass <sjg@chromium.org> diff --git a/drivers/usb/host/usb_bootdev.c b/drivers/usb/host/usb_bootdev.c index 06e8f61aa1..7fa1c601df 100644 --- a/drivers/usb/host/usb_bootdev.c +++ b/drivers/usb/host/usb_bootdev.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Bootdevice for USB + * Bootdev for USB * * Copyright 2021 Google LLC * Written by Simon Glass <sjg@chromium.org> diff --git a/fs/sandbox/host_bootdev.c b/fs/sandbox/host_bootdev.c index 0d12ee4ef7..3ef5362760 100644 --- a/fs/sandbox/host_bootdev.c +++ b/fs/sandbox/host_bootdev.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Bootdevice for MMC + * Bootdev for sandbox host * * Copyright 2021 Google LLC * Written by Simon Glass <sjg@chromium.org> diff --git a/include/bootdev.h b/include/bootdev.h index e72ef3650f..1533adfe50 100644 --- a/include/bootdev.h +++ b/include/bootdev.h @@ -200,7 +200,7 @@ void bootdev_clear_bootflows(struct udevice *dev); * All fields in @bflow must be set up. Note that @bflow->dev is used to add the * bootflow to that device. * - * @dev: Bootdevice device to add to + * @dev: Bootdev device to add to * @bflow: Bootflow to add. Note that fields within bflow must be allocated * since this function takes over ownership of these. This functions makes * a copy of @bflow itself (without allocating its fields again), so the diff --git a/include/bootflow.h b/include/bootflow.h index f20f575030..018d021b81 100644 --- a/include/bootflow.h +++ b/include/bootflow.h @@ -58,7 +58,7 @@ enum bootflow_flags_t { * * @bm_node: Points to siblings in the same bootdev * @glob_node: Points to siblings in the global list (all bootdev) - * @dev: Bootdevice device which produced this bootflow + * @dev: Bootdev device which produced this bootflow * @blk: Block device which contains this bootflow, NULL if this is a network * device or sandbox 'host' device * @part: Partition number (0 for whole device) diff --git a/net/eth_bootdev.c b/net/eth_bootdev.c index f7b4196f78..869adf8cbb 100644 --- a/net/eth_bootdev.c +++ b/net/eth_bootdev.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Bootdevice for ethernet (uses PXE) + * Bootdev for ethernet (uses PXE) * * Copyright 2021 Google LLC * Written by Simon Glass <sjg@chromium.org> |