From patchwork Thu Apr 18 07:01:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 237466 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 C315E2C01D1 for ; Thu, 18 Apr 2013 17:02:21 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755213Ab3DRHCR (ORCPT ); Thu, 18 Apr 2013 03:02:17 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:34073 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755134Ab3DRHCN (ORCPT ); Thu, 18 Apr 2013 03:02:13 -0400 Received: by mail-pa0-f43.google.com with SMTP id hz11so1386036pad.2 for ; Thu, 18 Apr 2013 00:02:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=mtKNi8uJMtlnYY/wEVbLN7n8++DJK4tAxdc19ht5tVM=; b=bcjD5aGlhhI+KFa5sP1Pkjcu4y/oAjTpQg3JQ45UuJTwL5Xfab2+/KUtIKXNAGqo9H EFQhx8HupS7HScbE1rgCfKaZpQpOBJqYO2O2LwvQNB3kSqUw6zDekJHBRcvF/btekybs megr5rYYts2UnRgz33n1aeUESibgQuXx9QHyExwPDTnIwBD4IubKy8FWsi3XDw0hMTBd G9OsJB72bMo1p71koWNx68XLhzMz/DjXlDUXT4wgQPfzEsvVZ9yrFXBpUYWrHyuQnAGR Ie26c8mXmCtRTMd2vFIX2a6XaKLqHXGjul/7P5GDCBjzqIV0MHZWtSN+k5lDZD/wwmtJ VosQ== X-Received: by 10.66.233.167 with SMTP id tx7mr12062032pac.110.1366268532620; Thu, 18 Apr 2013 00:02:12 -0700 (PDT) Received: from xps-iwamatsu.renesas.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPS id ba10sm8838249pbd.21.2013.04.18.00.02.10 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 00:02:11 -0700 (PDT) From: Nobuhiro Iwamatsu To: netdev@vger.kernel.org Cc: yoshihiro.shimoda.uh@renesas.com, Nobuhiro Iwamatsu Subject: [PATCH 5/8] net: sh-eth: Add CONFIG_PM to definition of dev_pm_ops Date: Thu, 18 Apr 2013 16:01:47 +0900 Message-Id: <1366268510-8121-5-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1366268510-8121-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> References: <1366268510-8121-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Gm-Message-State: ALoCoQmp0+ONa4xnouup3Q2QOTkz/2vtTHAsRn6BSVchGpce7wLVqze8m3AJNFTcER+pBgBWVlst Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Nobuhiro Iwamatsu --- drivers/net/ethernet/renesas/sh_eth.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 7de0b0e..af8c225 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -2772,6 +2772,7 @@ static int sh_eth_drv_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM static int sh_eth_runtime_nop(struct device *dev) { /* @@ -2785,17 +2786,21 @@ static int sh_eth_runtime_nop(struct device *dev) return 0; } -static struct dev_pm_ops sh_eth_dev_pm_ops = { +static const struct dev_pm_ops sh_eth_dev_pm_ops = { .runtime_suspend = sh_eth_runtime_nop, .runtime_resume = sh_eth_runtime_nop, }; +#define SH_ETH_PM_OPS &sh_eth_dev_pm_ops +#else +#define SH_ETH_PM_OPS NULL +#endif static struct platform_driver sh_eth_driver = { .probe = sh_eth_drv_probe, .remove = sh_eth_drv_remove, .driver = { .name = CARDNAME, - .pm = &sh_eth_dev_pm_ops, + .pm = SH_ETH_PM_OPS, }, };