From: Alex Kiernan <alex.kiernan@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v7 05/18] fastboot: Add missing newlines
Date: Thu, 24 May 2018 13:29:00 +0000 [thread overview]
Message-ID: <20180524132913.11575-6-alex.kiernan@gmail.com> (raw)
In-Reply-To: <20180524132913.11575-1-alex.kiernan@gmail.com>
Add newlines so we format our output correctly.
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Jocelyn Bohr <bohr@google.com>
---
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
drivers/fastboot/fb_mmc.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c
index 1bcb2e52d4..b1db29684d 100644
--- a/drivers/fastboot/fb_mmc.c
+++ b/drivers/fastboot/fb_mmc.c
@@ -125,7 +125,7 @@ static lbaint_t fb_mmc_get_boot_header(struct blk_desc *dev_desc,
sector_size = info->blksz;
hdr_sectors = DIV_ROUND_UP(sizeof(struct andr_img_hdr), sector_size);
if (hdr_sectors == 0) {
- pr_err("invalid number of boot sectors: 0");
+ pr_err("invalid number of boot sectors: 0\n");
fastboot_fail("invalid number of boot sectors: 0", response);
return 0;
}
@@ -133,7 +133,7 @@ static lbaint_t fb_mmc_get_boot_header(struct blk_desc *dev_desc,
/* Read the boot image header */
res = blk_dread(dev_desc, info->start, hdr_sectors, (void *)hdr);
if (res != hdr_sectors) {
- pr_err("cannot read header from boot partition");
+ pr_err("cannot read header from boot partition\n");
fastboot_fail("cannot read header from boot partition",
response);
return 0;
@@ -142,7 +142,7 @@ static lbaint_t fb_mmc_get_boot_header(struct blk_desc *dev_desc,
/* Check boot header magic string */
res = android_image_check_header(hdr);
if (res != 0) {
- pr_err("bad boot image magic");
+ pr_err("bad boot image magic\n");
fastboot_fail("boot partition not initialized", response);
return 0;
}
@@ -181,7 +181,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc,
/* Get boot partition info */
res = part_get_info_by_name(dev_desc, BOOT_PARTITION_NAME, &info);
if (res < 0) {
- pr_err("cannot find boot partition");
+ pr_err("cannot find boot partition\n");
fastboot_fail("cannot find boot partition", response);
return -1;
}
@@ -193,14 +193,14 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc,
/* Read boot image header */
hdr_sectors = fb_mmc_get_boot_header(dev_desc, &info, hdr, response);
if (hdr_sectors == 0) {
- pr_err("unable to read boot image header");
+ pr_err("unable to read boot image header\n");
fastboot_fail("unable to read boot image header", response);
return -1;
}
/* Check if boot image has second stage in it (we don't support it) */
if (hdr->second_size > 0) {
- pr_err("moving second stage is not supported yet");
+ pr_err("moving second stage is not supported yet\n");
fastboot_fail("moving second stage is not supported yet",
response);
return -1;
@@ -219,7 +219,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc,
res = blk_dread(dev_desc, ramdisk_sector_start, ramdisk_sectors,
ramdisk_buffer);
if (res != ramdisk_sectors) {
- pr_err("cannot read ramdisk from boot partition");
+ pr_err("cannot read ramdisk from boot partition\n");
fastboot_fail("cannot read ramdisk from boot partition",
response);
return -1;
@@ -229,7 +229,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc,
hdr->kernel_size = download_bytes;
res = blk_dwrite(dev_desc, info.start, hdr_sectors, (void *)hdr);
if (res == 0) {
- pr_err("cannot writeback boot image header");
+ pr_err("cannot writeback boot image header\n");
fastboot_fail("cannot write back boot image header", response);
return -1;
}
@@ -241,7 +241,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc,
res = blk_dwrite(dev_desc, kernel_sector_start, kernel_sectors,
download_buffer);
if (res == 0) {
- pr_err("cannot write new kernel");
+ pr_err("cannot write new kernel\n");
fastboot_fail("cannot write new kernel", response);
return -1;
}
@@ -253,7 +253,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc,
res = blk_dwrite(dev_desc, ramdisk_sector_start, ramdisk_sectors,
ramdisk_buffer);
if (res == 0) {
- pr_err("cannot write back original ramdisk");
+ pr_err("cannot write back original ramdisk\n");
fastboot_fail("cannot write back original ramdisk", response);
return -1;
}
@@ -371,21 +371,21 @@ void fb_mmc_erase(const char *cmd, char *response)
struct mmc *mmc = find_mmc_device(CONFIG_FASTBOOT_FLASH_MMC_DEV);
if (mmc == NULL) {
- pr_err("invalid mmc device");
+ pr_err("invalid mmc device\n");
fastboot_fail("invalid mmc device", response);
return;
}
dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV);
if (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) {
- pr_err("invalid mmc device");
+ pr_err("invalid mmc device\n");
fastboot_fail("invalid mmc device", response);
return;
}
ret = part_get_info_by_name_or_alias(dev_desc, cmd, &info);
if (ret < 0) {
- pr_err("cannot find partition: '%s'", cmd);
+ pr_err("cannot find partition: '%s'\n", cmd);
fastboot_fail("cannot find partition", response);
return;
}
@@ -404,7 +404,7 @@ void fb_mmc_erase(const char *cmd, char *response)
blks = blk_derase(dev_desc, blks_start, blks_size);
if (blks != blks_size) {
- pr_err("failed erasing from device %d", dev_desc->devnum);
+ pr_err("failed erasing from device %d\n", dev_desc->devnum);
fastboot_fail("failed erasing from device", response);
return;
}
--
2.17.0
next prev parent reply other threads:[~2018-05-24 13:29 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-24 13:28 [U-Boot] [PATCH v7 00/18] Add fastboot UDP support Alex Kiernan
2018-05-24 13:28 ` [U-Boot] [PATCH v7 01/18] fastboot: Move fastboot to drivers/fastboot Alex Kiernan
2018-05-24 13:28 ` [U-Boot] [PATCH v7 02/18] fastboot: Refactor fastboot_okay/fail to take response Alex Kiernan
2018-05-24 13:28 ` [U-Boot] [PATCH v7 03/18] fastboot: Extract fastboot_okay/fail to fb_common.c Alex Kiernan
2018-05-24 13:28 ` [U-Boot] [PATCH v7 04/18] fastboot: Correct dependencies in FASTBOOT_FLASH Alex Kiernan
2018-05-24 13:29 ` Alex Kiernan [this message]
2018-05-24 13:29 ` [U-Boot] [PATCH v7 06/18] fastboot: Remove FIXME for CONFIG_FASTBOOT_...NAME Alex Kiernan
2018-05-24 13:29 ` [U-Boot] [PATCH v7 07/18] fastboot: Fix parameter types in _fb_nand_write Alex Kiernan
2018-05-24 13:29 ` [U-Boot] [PATCH v7 08/18] fastboot: Rename fb_set_reboot_flag to fastboot_set_reboot_flag Alex Kiernan
2018-05-24 13:29 ` [U-Boot] [PATCH v7 09/18] fastboot: Extract common definitions from USB fastboot Alex Kiernan
2018-05-24 13:29 ` [U-Boot] [PATCH v7 10/18] fastboot: Rename public fb_ functions to fastboot_ Alex Kiernan
2018-05-24 13:29 ` [U-Boot] [PATCH v7 11/18] ti: fastboot: Move weak overrides to board files Alex Kiernan
2018-05-24 13:29 ` [U-Boot] [PATCH v7 12/18] fs: Add fs_get_type_name to return current filesystem name Alex Kiernan
2018-05-24 13:29 ` [U-Boot] [PATCH v7 13/18] fastboot: Migrate FASTBOOT_FLASH_NAND_TRIMFFS to Kconfig Alex Kiernan
2018-05-24 13:29 ` [U-Boot] [PATCH v7 14/18] mmc: Separate "mmc swrite" from fastboot Alex Kiernan
2018-05-25 2:41 ` Simon Glass
2018-05-25 10:02 ` Alex Kiernan
2018-05-24 13:29 ` [U-Boot] [PATCH v7 15/18] net: fastboot: Merge AOSP UDP fastboot Alex Kiernan
2018-05-24 13:29 ` [U-Boot] [PATCH v7 16/18] fastboot: Add support for 'oem format' command Alex Kiernan
2018-05-24 13:29 ` [U-Boot] [PATCH v7 17/18] usb: fastboot: Convert USB f_fastboot to shared fastboot Alex Kiernan
2018-05-25 2:41 ` Simon Glass
2018-05-24 13:29 ` [U-Boot] [PATCH v7 18/18] fastboot: Update fastboot documentation Alex Kiernan
2018-05-25 2:41 ` Simon Glass
2018-05-28 7:39 ` [U-Boot] [PATCH v7 00/18] Add fastboot UDP support Lukasz Majewski
2018-05-29 11:24 ` Alex Kiernan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180524132913.11575-6-alex.kiernan@gmail.com \
--to=alex.kiernan@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox