From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755395AbdEGVqG (ORCPT ); Sun, 7 May 2017 17:46:06 -0400 Received: from mout.web.de ([212.227.15.14]:53487 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752396AbdEGVqC (ORCPT ); Sun, 7 May 2017 17:46:02 -0400 Subject: [PATCH 4/4] s390/sysinfo: Combine two function calls into one From: SF Markus Elfring To: linux-s390@vger.kernel.org, =?UTF-8?Q?Christian_Borntr=c3=a4ger?= , Heiko Carstens , Ingo Molnar , Martin Schwidefsky , Paul Gortmaker , Peter Oberparleiter , Peter Zijlstra , Sascha Silbe , Vegard Nossum , Viktor Mihajlovski Cc: LKML , kernel-janitors@vger.kernel.org References: Message-ID: <04517191-f1f5-19ca-d4bc-d3d5331b4556@users.sourceforge.net> Date: Sun, 7 May 2017 19:18:06 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.0.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:dCEgGgM5vkqMtezEFS8tN/L4oaQ6S+Bfiy3/dxbHSV0nMDBm+bc JXz3RdXfn78sMNoskko8ZdSdDAcW1OP67CxKcsFdCpe466Mm9t55OhAbkCnORi+tm0XGNlg PP5BNG/f40BNOF12u/hf3cegWaWT/nnXrxMyxGagqdv+4W1wztfiDjVjbFfiHO/6wssIAaN p+Cwj7nQmflvKYQzrVnKA== X-UI-Out-Filterresults: notjunk:1;V01:K0:drvHuIZ3sDs=:Fmdcykm6RCurBRLUjj1Tfd NaPFYxAG47scIP0J4Z6ti+5m74iF7a2BYTqHcWEsXMQRuqa/tYfa+cdNfGLFGaqoJQrnUfa60 UlrETG43+98EPIOTk4YDzZ2yOx3rsMXEra5Wert2dtFr5uqjD823aE+3oWdhhjAfOyMzMgeNA bLqg05qDXFHZM36H4Yr9bZk796Xlj+J//b5xK2D1udbFTBUPFF5HsK5JTpMeAUr02y/1T66Ry p1Z2RZYYMiGhTbNXNTYOgBkeZHc2b/tHExAvkRiwsskBTpzT62JztL0Z9LD06eLTriFt/H8k2 JcVnZxD9e8V6JqW4Or9oJoEtq356KX0+pc3jugLlAIbwX+97/DuvBOIyl7c0htne7bdkf+hqI vJutTefP+V6LNyhdeTgHtjOPwgqq+2NuaEGwWT/c+6CQU4gBNTFzzvfNqLKYK4Ecl/SSVnYZz cEKQmM0KS7Mhdz+r/U2UrLIBIru7qraggsC9k6o30e8kjnGWkyqjooDV5pfmglDsKz7uMaiB4 oGgkzSy4CHJcMWQ4vRQrCFmKCScbGe5d4yEVe+s0+74smGEFXahe02tbgveoMZBRtVaa+0wS9 KgWIO9S4jNQBA6kItjTei/I3qAHnULVFJSLEjJhmKbJJGPI7Wbw7xcHuAjrQkodMWLLZAYuzx Y60BHgUkH7cGG+seoQA3Tg++HHMrtglOpuSf8srf3eefpN0H8BUQTNQXGOcY6Bzh9k8qZ1vn3 lbRqUZbFeTsuERM9+UiOceBjSShDAxxAENbdVVffuqiAyWQaR1o3tJKAHO/+GbqtaXSWRlnFf uBAtLW8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 7 May 2017 18:48:39 +0200 A bit of data was put into a sequence by two separate function calls at four places. Print the same data by single function calls instead. Signed-off-by: Markus Elfring --- arch/s390/kernel/sysinfo.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/s390/kernel/sysinfo.c b/arch/s390/kernel/sysinfo.c index e7061fcd047a..7f81d40c8f90 100644 --- a/arch/s390/kernel/sysinfo.c +++ b/arch/s390/kernel/sysinfo.c @@ -98,8 +98,7 @@ static void stsi_1_1_1(struct seq_file *m, struct sysinfo_1_1_1 *info) seq_printf(m, "Model: %-16.16s", info->model_capacity); if (info->model[0] != '\0') seq_printf(m, " %-16.16s", info->model); - seq_putc(m, '\n'); - seq_printf(m, "Sequence Code: %-16.16s\n", info->sequence); + seq_printf(m, "\nSequence Code: %-16.16s\n", info->sequence); seq_printf(m, "Plant: %-4.4s\n", info->plant); seq_printf(m, "Model Capacity: %-16.16s %08u\n", info->model_capacity, info->model_cap_rating); @@ -200,8 +199,7 @@ static void stsi_2_2_2(struct seq_file *m, struct sysinfo_2_2_2 *info) if (stsi(info, 2, 2, 2)) return; EBCASC(info->name, sizeof(info->name)); - seq_putc(m, '\n'); - seq_printf(m, "LPAR Number: %d\n", info->lpar_number); + seq_printf(m, "\nLPAR Number: %d\n", info->lpar_number); seq_puts(m, "LPAR Characteristics: "); if (info->characteristics & LPAR_CHAR_DEDICATED) seq_puts(m, "Dedicated "); @@ -209,8 +207,7 @@ static void stsi_2_2_2(struct seq_file *m, struct sysinfo_2_2_2 *info) seq_puts(m, "Shared "); if (info->characteristics & LPAR_CHAR_LIMITED) seq_puts(m, "Limited "); - seq_putc(m, '\n'); - seq_printf(m, "LPAR Name: %-8.8s\n", info->name); + seq_printf(m, "\nLPAR Name: %-8.8s\n", info->name); seq_printf(m, "LPAR Adjustment: %d\n", info->caf); seq_printf(m, "LPAR CPUs Total: %d\n", info->cpus_total); seq_printf(m, "LPAR CPUs Configured: %d\n", info->cpus_configured); @@ -256,8 +253,8 @@ static void stsi_3_2_2(struct seq_file *m, struct sysinfo_3_2_2 *info) for (i = 0; i < info->count; i++) { EBCASC(info->vm[i].name, sizeof(info->vm[i].name)); EBCASC(info->vm[i].cpi, sizeof(info->vm[i].cpi)); - seq_putc(m, '\n'); - seq_printf(m, "VM%02d Name: %-8.8s\n", i, info->vm[i].name); + seq_printf(m, "\nVM%02d Name: %-8.8s\n", + i, info->vm[i].name); seq_printf(m, "VM%02d Control Program: %-16.16s\n", i, info->vm[i].cpi); seq_printf(m, "VM%02d Adjustment: %d\n", i, info->vm[i].caf); seq_printf(m, "VM%02d CPUs Total: %d\n", i, info->vm[i].cpus_total); -- 2.12.2