From a665ef716a9a90c30fb15e1f979845b3438a7251 Mon Sep 17 00:00:00 2001 From: Eric Wetzel Date: Wed, 5 Jan 2011 14:24:54 -0500 Subject: nit: do not add \n at end of LOG_ERROR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixed in many other places, and submitted in response to Øyvind's invitation. --- src/flash/nand/davinci.c | 2 +- src/flash/nand/nuc910.c | 2 +- src/flash/nand/orion.c | 4 ++-- src/flash/nand/s3c24xx.c | 2 +- src/flash/nor/aduc702x.c | 6 +++--- src/flash/nor/at91sam3.c | 8 ++++---- src/flash/nor/ecos.c | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/flash') diff --git a/src/flash/nand/davinci.c b/src/flash/nand/davinci.c index af39dbf9..b7fe66ea 100644 --- a/src/flash/nand/davinci.c +++ b/src/flash/nand/davinci.c @@ -263,7 +263,7 @@ static int davinci_write_page(struct nand_device *nand, uint32_t page, /* Always write both data and OOB ... we are not "raw" I/O! */ if (!data) { - LOG_ERROR("Missing NAND data; try 'nand raw_access enable'\n"); + LOG_ERROR("Missing NAND data; try 'nand raw_access enable'"); return ERROR_NAND_OPERATION_FAILED; } diff --git a/src/flash/nand/nuc910.c b/src/flash/nand/nuc910.c index e7e78556..7b598d23 100644 --- a/src/flash/nand/nuc910.c +++ b/src/flash/nand/nuc910.c @@ -169,7 +169,7 @@ NAND_DEVICE_COMMAND_HANDLER(nuc910_nand_device_command) nuc910_nand = calloc(1, sizeof(struct nuc910_nand_controller)); if (!nuc910_nand) { - LOG_ERROR("no memory for nand controller\n"); + LOG_ERROR("no memory for nand controller"); return ERROR_NAND_DEVICE_INVALID; } diff --git a/src/flash/nand/orion.c b/src/flash/nand/orion.c index 00c95192..5b0c9642 100644 --- a/src/flash/nand/orion.c +++ b/src/flash/nand/orion.c @@ -121,13 +121,13 @@ NAND_DEVICE_COMMAND_HANDLER(orion_nand_device_command) uint8_t ale, cle; if (CMD_ARGC != 3) { - LOG_ERROR("arguments must be: \n"); + LOG_ERROR("arguments must be: "); return ERROR_NAND_DEVICE_INVALID; } hw = calloc(1, sizeof(*hw)); if (!hw) { - LOG_ERROR("no memory for nand controller\n"); + LOG_ERROR("no memory for nand controller"); return ERROR_NAND_DEVICE_INVALID; } diff --git a/src/flash/nand/s3c24xx.c b/src/flash/nand/s3c24xx.c index eb20f35c..2fa18de3 100644 --- a/src/flash/nand/s3c24xx.c +++ b/src/flash/nand/s3c24xx.c @@ -38,7 +38,7 @@ S3C24XX_DEVICE_COMMAND() struct s3c24xx_nand_controller *s3c24xx_info; s3c24xx_info = malloc(sizeof(struct s3c24xx_nand_controller)); if (s3c24xx_info == NULL) { - LOG_ERROR("no memory for nand controller\n"); + LOG_ERROR("no memory for nand controller"); return -ENOMEM; } diff --git a/src/flash/nor/aduc702x.c b/src/flash/nor/aduc702x.c index 40ee3212..2005b78f 100644 --- a/src/flash/nor/aduc702x.c +++ b/src/flash/nor/aduc702x.c @@ -112,7 +112,7 @@ static int aduc702x_erase(struct flash_bank *bank, int first, int last) if (aduc702x_check_flash_completion(target, 3500) != ERROR_OK) { - LOG_ERROR("mass erase failed\n"); + LOG_ERROR("mass erase failed"); aduc702x_set_write_enable(target, 0); return ERROR_FLASH_OPERATION_FAILED; } @@ -132,7 +132,7 @@ static int aduc702x_erase(struct flash_bank *bank, int first, int last) if (aduc702x_check_flash_completion(target, 50) != ERROR_OK) { - LOG_ERROR("failed to erase sector at address 0x%08lX\n", adr); + LOG_ERROR("failed to erase sector at address 0x%08lX", adr); aduc702x_set_write_enable(target, 0); return ERROR_FLASH_SECTOR_NOT_ERASED; } @@ -330,7 +330,7 @@ static int aduc702x_write_single(struct flash_bank *bank, uint8_t *buffer, uint3 if (aduc702x_check_flash_completion(target, 1) != ERROR_OK) { - LOG_ERROR("single write failed for address 0x%08lX\n", (unsigned long)(offset + x)); + LOG_ERROR("single write failed for address 0x%08lX", (unsigned long)(offset + x)); aduc702x_set_write_enable(target, 0); return ERROR_FLASH_OPERATION_FAILED; } diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c index b8789a3c..94b37243 100644 --- a/src/flash/nor/at91sam3.c +++ b/src/flash/nor/at91sam3.c @@ -1787,7 +1787,7 @@ sam3_ReadThisReg(struct sam3_chip *pChip, uint32_t *goes_here) r = target_read_u32(pChip->target, pReg->address, goes_here); if (r != ERROR_OK) { - LOG_ERROR("Cannot read SAM3 register: %s @ 0x%08x, Err: %d\n", + LOG_ERROR("Cannot read SAM3 register: %s @ 0x%08x, Err: %d", pReg->name, (unsigned)(pReg->address), r); } return r; @@ -1806,7 +1806,7 @@ sam3_ReadAllRegs(struct sam3_chip *pChip) r = sam3_ReadThisReg(pChip, sam3_get_reg_ptr(&(pChip->cfg), pReg)); if (r != ERROR_OK) { - LOG_ERROR("Cannot read SAM3 registere: %s @ 0x%08x, Error: %d\n", + LOG_ERROR("Cannot read SAM3 registere: %s @ 0x%08x, Error: %d", pReg->name, ((unsigned)(pReg->address)), r); return r; } @@ -1869,7 +1869,7 @@ sam3_erase_check(struct flash_bank *bank) return ERROR_TARGET_NOT_HALTED; } if (0 == bank->num_sectors) { - LOG_ERROR("Target: not supported/not probed\n"); + LOG_ERROR("Target: not supported/not probed"); return ERROR_FAIL; } @@ -2066,7 +2066,7 @@ _sam3_probe(struct flash_bank *bank, int noise) pPrivate = get_sam3_bank_private(bank); if (!pPrivate) { - LOG_ERROR("Invalid/unknown bank number\n"); + LOG_ERROR("Invalid/unknown bank number"); return ERROR_FAIL; } diff --git a/src/flash/nor/ecos.c b/src/flash/nor/ecos.c index 945852dd..c850f4f9 100644 --- a/src/flash/nor/ecos.c +++ b/src/flash/nor/ecos.c @@ -264,7 +264,7 @@ static int eCosBoard_erase(struct ecosflash_flash_bank *info, uint32_t address, if (flashErr != 0x0) { - LOG_ERROR("Flash erase failed with %d (%s)\n", (int)flashErr, flash_errmsg(flashErr)); + LOG_ERROR("Flash erase failed with %d (%s)", (int)flashErr, flash_errmsg(flashErr)); return ERROR_FAIL; } @@ -322,7 +322,7 @@ static int eCosBoard_flash(struct ecosflash_flash_bank *info, void *data, uint32 if (flashErr != 0x0) { - LOG_ERROR("Flash prog failed with %d (%s)\n", (int)flashErr, flash_errmsg(flashErr)); + LOG_ERROR("Flash prog failed with %d (%s)", (int)flashErr, flash_errmsg(flashErr)); return ERROR_FAIL; } } -- cgit v1.2.3