You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
6 years ago
|
From 0c3fac1d19848029b6e76cdf3585358f313d5117 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andreas Gustafsson <gson@gson.org>
|
||
|
|
Date: Tue, 7 Aug 2018 20:19:07 +0300
|
||
|
|
Subject: [PATCH 363/454] End log messages in one newline, not two.
|
||
|
|
|
||
|
|
Signed-off-by: Andreas Gustafsson <gson@gson.org>
|
||
|
|
---
|
||
|
|
.../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 4 ++--
|
||
|
|
.../vc04_services/interface/vchiq_arm/vchiq_kern_lib.c | 6 +++---
|
||
|
|
2 files changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
|
||
|
|
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
|
||
|
|
@@ -2084,7 +2084,7 @@ dump_phys_mem(void *virt_addr, u32 num_b
|
||
|
|
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;
|
||
|
|
}
|
||
|
|
@@ -2103,7 +2103,7 @@ dump_phys_mem(void *virt_addr, u32 num_b
|
||
|
|
|
||
|
|
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;
|
||
|
|
}
|
||
|
|
|
||
|
|
--- 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_IN
|
||
|
|
}
|
||
|
|
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;
|
||
|
|
}
|
||
|
|
|