kernel: bump 4.14 to 4.14.155
[openwrt/openwrt.git] / target / linux / brcm2708 / patches-4.14 / 950-0363-End-log-messages-in-one-newline-not-two.patch
1 From 0c3fac1d19848029b6e76cdf3585358f313d5117 Mon Sep 17 00:00:00 2001
2 From: Andreas Gustafsson <gson@gson.org>
3 Date: Tue, 7 Aug 2018 20:19:07 +0300
4 Subject: [PATCH 363/454] End log messages in one newline, not two.
5
6 Signed-off-by: Andreas Gustafsson <gson@gson.org>
7 ---
8 .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 4 ++--
9 .../vc04_services/interface/vchiq_arm/vchiq_kern_lib.c | 6 +++---
10 2 files changed, 5 insertions(+), 5 deletions(-)
11
12 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
13 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
14 @@ -2084,7 +2084,7 @@ dump_phys_mem(void *virt_addr, u32 num_b
15 pages = kmalloc(sizeof(struct page *) * num_pages, GFP_KERNEL);
16 if (!pages) {
17 vchiq_log_error(vchiq_arm_log_level,
18 - "Unable to allocation memory for %d pages\n",
19 + "Unable to allocation memory for %d pages",
20 num_pages);
21 return;
22 }
23 @@ -2103,7 +2103,7 @@ dump_phys_mem(void *virt_addr, u32 num_b
24
25 if (rc < 0) {
26 vchiq_log_error(vchiq_arm_log_level,
27 - "Failed to get user pages: %d\n", rc);
28 + "Failed to get user pages: %d", rc);
29 goto out;
30 }
31
32 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
33 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
34 @@ -89,17 +89,17 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_IN
35 }
36 if (i == VCHIQ_INIT_RETRIES) {
37 vchiq_log_error(vchiq_core_log_level,
38 - "%s: videocore not initialized\n", __func__);
39 + "%s: videocore not initialized", __func__);
40 goto failed;
41 } else if (i > 0) {
42 vchiq_log_warning(vchiq_core_log_level,
43 - "%s: videocore initialized after %d retries\n", __func__, i);
44 + "%s: videocore initialized after %d retries", __func__, i);
45 }
46
47 instance = kzalloc(sizeof(*instance), GFP_KERNEL);
48 if (!instance) {
49 vchiq_log_error(vchiq_core_log_level,
50 - "%s: error allocating vchiq instance\n", __func__);
51 + "%s: error allocating vchiq instance", __func__);
52 goto failed;
53 }
54