From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753689AbdCMVN3 (ORCPT ); Mon, 13 Mar 2017 17:13:29 -0400 Received: from terminus.zytor.com ([65.50.211.136]:50508 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751477AbdCMVN0 (ORCPT ); Mon, 13 Mar 2017 17:13:26 -0400 Date: Mon, 13 Mar 2017 14:12:52 -0700 From: tip-bot for Andy Shevchenko Message-ID: Cc: tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org, andriy.shevchenko@linux.intel.com, hpa@zytor.com Reply-To: linux-kernel@vger.kernel.org, andriy.shevchenko@linux.intel.com, hpa@zytor.com, peterz@infradead.org, mingo@kernel.org, tglx@linutronix.de In-Reply-To: <20170308112422.67533-1-andriy.shevchenko@linux.intel.com> References: <20170308112422.67533-1-andriy.shevchenko@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/platform/intel-mid: Use common power off sequence Git-Commit-ID: c836e5cf0d0880d6668966476c4ffe727f29f69a 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: c836e5cf0d0880d6668966476c4ffe727f29f69a Gitweb: http://git.kernel.org/tip/c836e5cf0d0880d6668966476c4ffe727f29f69a Author: Andy Shevchenko AuthorDate: Wed, 8 Mar 2017 13:24:21 +0200 Committer: Thomas Gleixner CommitDate: Mon, 13 Mar 2017 22:08:28 +0100 x86/platform/intel-mid: Use common power off sequence Intel Medfield may use common for Intel MID devices power sequence. Remove unneded custom power off stub. While here, remove function forward declaration. Signed-off-by: Andy Shevchenko Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20170308112422.67533-1-andriy.shevchenko@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/platform/intel-mid/mfld.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c index e793fe5..e42978d 100644 --- a/arch/x86/platform/intel-mid/mfld.c +++ b/arch/x86/platform/intel-mid/mfld.c @@ -17,16 +17,6 @@ #include "intel_mid_weak_decls.h" -static void penwell_arch_setup(void); -/* penwell arch ops */ -static struct intel_mid_ops penwell_ops = { - .arch_setup = penwell_arch_setup, -}; - -static void mfld_power_off(void) -{ -} - static unsigned long __init mfld_calibrate_tsc(void) { unsigned long fast_calibrate; @@ -63,9 +53,12 @@ static unsigned long __init mfld_calibrate_tsc(void) static void __init penwell_arch_setup(void) { x86_platform.calibrate_tsc = mfld_calibrate_tsc; - pm_power_off = mfld_power_off; } +static struct intel_mid_ops penwell_ops = { + .arch_setup = penwell_arch_setup, +}; + void *get_penwell_ops(void) { return &penwell_ops;