From bf844d646af9c6e03fa0d9f7113257d13988838d Mon Sep 17 00:00:00 2001 From: Andreas Gustafsson Date: Tue, 7 Aug 2018 20:19:07 +0300 Subject: [PATCH 398/401] End log messages in one newline, not two. Signed-off-by: Andreas Gustafsson --- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 4 ++-- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index fe99c96fc6fc..63e4308a4f71 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -2079,7 +2079,7 @@ dump_phys_mem(void *virt_addr, u32 num_bytes) pages = kmalloc(sizeof(struct page *) * num_pages, GFP_KERNEL); if (!pages) { vchiq_log_error(vchiq_arm_log_level, - "Unable to allocation memory for %d pages\n", + "Unable to allocation memory for %d pages", num_pages); return; } @@ -2098,7 +2098,7 @@ dump_phys_mem(void *virt_addr, u32 num_bytes) if (rc < 0) { vchiq_log_error(vchiq_arm_log_level, - "Failed to get user pages: %d\n", rc); + "Failed to get user pages: %d", rc); goto out; } diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c index 34f746db19cd..bd65a21e5d2b 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c @@ -89,17 +89,17 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out) } if (i == VCHIQ_INIT_RETRIES) { vchiq_log_error(vchiq_core_log_level, - "%s: videocore not initialized\n", __func__); + "%s: videocore not initialized", __func__); goto failed; } else if (i > 0) { vchiq_log_warning(vchiq_core_log_level, - "%s: videocore initialized after %d retries\n", __func__, i); + "%s: videocore initialized after %d retries", __func__, i); } instance = kzalloc(sizeof(*instance), GFP_KERNEL); if (!instance) { vchiq_log_error(vchiq_core_log_level, - "%s: error allocating vchiq instance\n", __func__); + "%s: error allocating vchiq instance", __func__); goto failed; } -- 2.16.1