From patchwork Tue May 7 05:17:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 241970 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 D31722C0112 for ; Tue, 7 May 2013 15:18:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751015Ab3EGFS0 (ORCPT ); Tue, 7 May 2013 01:18:26 -0400 Received: from mail-da0-f43.google.com ([209.85.210.43]:42548 "EHLO mail-da0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757760Ab3EGFSY (ORCPT ); Tue, 7 May 2013 01:18:24 -0400 Received: by mail-da0-f43.google.com with SMTP id u7so118287dae.2 for ; Mon, 06 May 2013 22:18:23 -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=y3NtmE8PAmKrVCbZQm7Dg5UxzRhpwNHTBnZv+qihZwE=; b=nd1T6FOKjnAxTAZgmTiy87MTYadh/YDaDw2xT+FjEYOGh/hEiba0dfH7hvmcL5UlcF Hl63zpQNu+eKaK79RXWEOATMt7rmPKX1XUiiT7ovAPIgphmIBM4iZCfwBI5iK2FSVpEP wY1xVw5z2Xr3N9d18vETko3Ir+p/PNsiVRrrV62xZ1hNcbUzHGtA0a+XThGYbUWDwLNd n7wKeV7AZXwwVmkgPytWjuZQi8WJIaF1Wp3j5Z7sKsY5qVi+HIGON26vPccfGVHHRUnk Na1NaBNsO3eS050cZK7wIgryEYclFLJ/vcOtM45f8WGugel2BgLzqsuJsOFkTvmP50R9 Bwhw== X-Received: by 10.68.136.168 with SMTP id qb8mr670986pbb.20.1367903903294; Mon, 06 May 2013 22:18:23 -0700 (PDT) Received: from xps-iwamatsu.renesas.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id em2sm26775526pbb.0.2013.05.06.22.18.20 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 06 May 2013 22:18:22 -0700 (PDT) From: Nobuhiro Iwamatsu To: netdev@vger.kernel.org Cc: yoshihiro.shimoda.uh@renesas.com, sergei.shtylyov@cogentembedded.com, Nobuhiro Iwamatsu Subject: [PATCH v3 6/9] net: sh-eth: Add CONFIG_PM to definition of dev_pm_ops Date: Tue, 7 May 2013 14:17:52 +0900 Message-Id: <1367903875-32606-6-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1367903875-32606-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> References: <1367903875-32606-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Gm-Message-State: ALoCoQnS0T9Ew2ND/sdeRTJgj3VoELIK3MH+dTCtLCLJSPQsl1avAR97jIwnd0wQ+f2fRXUScWlA Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Nobuhiro Iwamatsu --- V3: Fix "ERROR: Macros with complex values should be enclosed in parenthesis" by SH_ETH_PM_OPS. 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 667c908..fe9ff35 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -2771,6 +2771,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) { /* @@ -2784,17 +2785,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, }, };