From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755686AbcASNjV (ORCPT ); Tue, 19 Jan 2016 08:39:21 -0500 Received: from terminus.zytor.com ([198.137.202.10]:43898 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755591AbcASNjC (ORCPT ); Tue, 19 Jan 2016 08:39:02 -0500 Date: Tue, 19 Jan 2016 05:37:51 -0800 From: tip-bot for Andy Shevchenko Message-ID: Cc: tglx@linutronix.de, hpa@zytor.com, luto@amacapital.net, bp@alien8.de, mika.westerberg@linux.intel.com, dvlasenk@redhat.com, mingo@kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, peterz@infradead.org, brgerst@gmail.com, andriy.shevchenko@linux.intel.com Reply-To: tglx@linutronix.de, hpa@zytor.com, luto@amacapital.net, peterz@infradead.org, brgerst@gmail.com, andriy.shevchenko@linux.intel.com, mingo@kernel.org, dvlasenk@redhat.com, bp@alien8.de, mika.westerberg@linux.intel.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org In-Reply-To: <1452888668-147116-2-git-send-email-andriy.shevchenko@linux.intel.com> References: <1452888668-147116-2-git-send-email-andriy.shevchenko@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/platform/intel-mid: Join string and fix SoC name Git-Commit-ID: b000de5848441bc4e99c662fe1fd1b854151a84e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b000de5848441bc4e99c662fe1fd1b854151a84e Gitweb: http://git.kernel.org/tip/b000de5848441bc4e99c662fe1fd1b854151a84e Author: Andy Shevchenko AuthorDate: Fri, 15 Jan 2016 22:11:08 +0200 Committer: Ingo Molnar CommitDate: Tue, 19 Jan 2016 08:39:56 +0100 x86/platform/intel-mid: Join string and fix SoC name Join string back to make grepping a bit easier. While here, lowering case for Penwell SoC name in one case to be aligned with the rest messages. Signed-off-by: Andy Shevchenko Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Mika Westerberg Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1452888668-147116-2-git-send-email-andriy.shevchenko@linux.intel.com Signed-off-by: Ingo Molnar --- arch/x86/platform/intel-mid/intel-mid.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c index 1bbc21e..90bb997 100644 --- a/arch/x86/platform/intel-mid/intel-mid.c +++ b/arch/x86/platform/intel-mid/intel-mid.c @@ -138,7 +138,7 @@ static void intel_mid_arch_setup(void) intel_mid_ops = get_intel_mid_ops[__intel_mid_cpu_chip](); else { intel_mid_ops = get_intel_mid_ops[INTEL_MID_CPU_CHIP_PENWELL](); - pr_info("ARCH: Unknown SoC, assuming PENWELL!\n"); + pr_info("ARCH: Unknown SoC, assuming Penwell!\n"); } out: @@ -214,12 +214,10 @@ static inline int __init setup_x86_intel_mid_timer(char *arg) else if (strcmp("lapic_and_apbt", arg) == 0) intel_mid_timer_options = INTEL_MID_TIMER_LAPIC_APBT; else { - pr_warn("X86 INTEL_MID timer option %s not recognised" - " use x86_intel_mid_timer=apbt_only or lapic_and_apbt\n", - arg); + pr_warn("X86 INTEL_MID timer option %s not recognised use x86_intel_mid_timer=apbt_only or lapic_and_apbt\n", + arg); return -EINVAL; } return 0; } __setup("x86_intel_mid_timer=", setup_x86_intel_mid_timer); -