From patchwork Fri Mar 14 06:57:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hao X-Patchwork-Id: 330216 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2510B2C0105 for ; Fri, 14 Mar 2014 17:57:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755379AbaCNG5p (ORCPT ); Fri, 14 Mar 2014 02:57:45 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:63091 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755234AbaCNG5o (ORCPT ); Fri, 14 Mar 2014 02:57:44 -0400 Received: by mail-pd0-f179.google.com with SMTP id w10so2163301pde.10 for ; Thu, 13 Mar 2014 23:57:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=nI3KfkmT45IZj92+yuNV+qGqdrRUhkXOX3wQQRXDubw=; b=zZg9B9VQGyvKLyNlki7vhBYm474bML8Ggc7cEgXLk3x52X87av866V967Hcgs0y6eV G0b3RDHLjwptr/gJno1t61+xae8aSUwC9t5SnAB2iSrHbyt3AofCcw42CQyrnP5KXanl 4q9He0MC0WEqPc9NWN+NNtNwVy23oE+Gah3pGen5feMT7X+RhsjpNifHvHQ44NUfFZ88 6fnSgKnzaBG321WylhOquxjlotaICXa3F6OX+wHIkx42T6MNT6R58md4chxxKGYcFP8s 7aD3vpfiDGhzAT/Qc2doCqX4365NraqfmG6S+rJeg0SZgsEmHEg7EzUVN107F372pQ3m fM3A== X-Received: by 10.66.27.202 with SMTP id v10mr7149618pag.127.1394780264435; Thu, 13 Mar 2014 23:57:44 -0700 (PDT) Received: from pek-khao-d1.corp.ad.wrs.com ([1.202.252.122]) by mx.google.com with ESMTPSA id zb2sm13413432pbc.30.2014.03.13.23.57.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Mar 2014 23:57:43 -0700 (PDT) From: Kevin Hao To: e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org Subject: [PATCH net-next] e1000e: fix the build error when PM is disabled Date: Fri, 14 Mar 2014 14:57:13 +0800 Message-Id: <1394780233-8066-1-git-send-email-haokexin@gmail.com> X-Mailer: git-send-email 1.8.5.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The commit 2800209994f8 (e1000e: Refactor PM flows) changed the SET_SYSTEM_SLEEP_PM_OPS to open-coded assignment, but forgot to protect them with CONFIG_PM_SLEEP. Then cause the following build error when PM is disabled: drivers/net/ethernet/intel/e1000e/netdev.c:7079:13: error: 'e1000e_pm_suspend' undeclared here (not in a function) .suspend = e1000e_pm_suspend, ^ drivers/net/ethernet/intel/e1000e/netdev.c:7080:13: error: 'e1000e_pm_resume' undeclared here (not in a function) .resume = e1000e_pm_resume, ^ drivers/net/ethernet/intel/e1000e/netdev.c:7082:11: error: 'e1000e_pm_thaw' undeclared here (not in a function) .thaw = e1000e_pm_thaw, ^ Signed-off-by: Kevin Hao --- drivers/net/ethernet/intel/e1000e/netdev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 3f044e736de8..eafad410e59a 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -7076,12 +7076,14 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = { MODULE_DEVICE_TABLE(pci, e1000_pci_tbl); static const struct dev_pm_ops e1000_pm_ops = { +#ifdef CONFIG_PM_SLEEP .suspend = e1000e_pm_suspend, .resume = e1000e_pm_resume, .freeze = e1000e_pm_freeze, .thaw = e1000e_pm_thaw, .poweroff = e1000e_pm_suspend, .restore = e1000e_pm_resume, +#endif SET_RUNTIME_PM_OPS(e1000e_pm_runtime_suspend, e1000e_pm_runtime_resume, e1000e_pm_runtime_idle) };