From patchwork Thu Apr 18 10:11:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 237604 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 362032C01C0 for ; Thu, 18 Apr 2013 20:11:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967685Ab3DRKLd (ORCPT ); Thu, 18 Apr 2013 06:11:33 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:64598 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967682Ab3DRKLb (ORCPT ); Thu, 18 Apr 2013 06:11:31 -0400 Received: by mail-pa0-f53.google.com with SMTP id bh4so1480805pad.40 for ; Thu, 18 Apr 2013 03:11:31 -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=HduRp/mDkEXN54ii+/LVFPZVuXMKq/rg+WE6L6zdP0c=; b=MntrKMzzdku1VusbN4cKRYvYN/b+dvTWmIb4+pejyS6GA6HWtzwWzj9CKp4WeNVaTb aSGKJBx5FTSkHGksZBD3ZM7hjXdJKXwYVCbct3E25tHjkqjPm0Zj6VJqcNvAO1S4VTdd H4byTU85iLOtXlcpPGOcCXjkj8Aey32lCP27fdhGLl/gy8L4Rd/DB4WrZuC6HbjoU6IR Zf/QxWXOcna3NxSZEICgKsO7LoALTcN21eVAdgQF3jodVXBYDRKvtRm+BSoof3EvJgGS XPOdvLwNpBp2OPPaYkFUD2f52q8HM0D7RulxV4mHHA4qrhWxAGrmyDhGssS2quBwZ2ID MODQ== X-Received: by 10.68.104.2 with SMTP id ga2mr13057335pbb.116.1366279891241; Thu, 18 Apr 2013 03:11:31 -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 kd7sm9364960pbb.34.2013.04.18.03.11.28 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 03:11:30 -0700 (PDT) From: Nobuhiro Iwamatsu To: netdev@vger.kernel.org Cc: yoshihiro.shimoda.uh@renesas.com, Nobuhiro Iwamatsu Subject: [PATCH v2 5/8] net: sh-eth: Add CONFIG_PM to definition of dev_pm_ops Date: Thu, 18 Apr 2013 19:11:06 +0900 Message-Id: <1366279869-23387-5-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1366279869-23387-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> References: <1366279869-23387-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Gm-Message-State: ALoCoQkyz1fYpKoY0PH3oKZW69/sZ39W/55E0KF5YvNXnypthO85AkFH4Vmv90PeEpOe3O80FX2J Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Nobuhiro Iwamatsu --- v2: no change. 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, }, };