From patchwork Thu Jul 24 20:26:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 373516 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 5935814009B for ; Fri, 25 Jul 2014 06:26:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934569AbaGXU0p (ORCPT ); Thu, 24 Jul 2014 16:26:45 -0400 Received: from mail-yk0-f181.google.com ([209.85.160.181]:60040 "EHLO mail-yk0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934176AbaGXU0o (ORCPT ); Thu, 24 Jul 2014 16:26:44 -0400 Received: by mail-yk0-f181.google.com with SMTP id q200so2175370ykb.12 for ; Thu, 24 Jul 2014 13:26:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=aZp0swn7BAcl5aNm1jkMz3umSBh5cEKvlo3mwPcPIgk=; b=NabxaluD/umuObNEaDT9lVeha1Y3p4dlotAtjzAZFZueVvjDcutELwMk1Q0rJppL+n DjRkkD1woy3OLJ39Dba067G5F7LcmkxZ80VusL3ZGSg2EAbrhxIApIIusj7WCp5GchZe jSRbT/pZoos3A28PgvwTQLw3misxOHZ5bPD1EugrYyoHfvp+0f2brlVK09PpA4w7h5m9 Yeuy8C9ZbWhvAyri0E9MVvq7FblN4CsuizaeyC6xe6YfOuCDVUI/M6Mo/8AXqAY9fzC7 mDWXZvTZ+6n63yziiDY04D9ZbS/cDaIR5Ku4m0/GBpcBTXIqnDPPbggSMPDknh+Wr+08 O0bw== X-Received: by 10.236.227.230 with SMTP id d96mr15984142yhq.100.1406233603770; Thu, 24 Jul 2014 13:26:43 -0700 (PDT) Received: from localhost.localdomain ([187.66.156.183]) by mx.google.com with ESMTPSA id k29sm16156439yha.33.2014.07.24.13.26.41 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 24 Jul 2014 13:26:42 -0700 (PDT) From: Fabio Estevam To: davem@davemloft.net Cc: netdev@vger.kernel.org, Fabio Estevam Subject: [PATCH net-next] fec: Simplify the PM related hooks Date: Thu, 24 Jul 2014 17:26:27 -0300 Message-Id: <1406233587-29143-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.8.3.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Fabio Estevam Get rid of the CONFIG_PM_SLEEP ifdef by annoting the suspend/resume functions with '__maybe_unused' in order to keep the code simpler and shorter. While at it, declare the suspend/resume functions in a single line. Signed-off-by: Fabio Estevam --- drivers/net/ethernet/freescale/fec_main.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index e0efb21..66fe1f6 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -2696,9 +2696,7 @@ fec_drv_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM_SLEEP -static int -fec_suspend(struct device *dev) +static int __maybe_unused fec_suspend(struct device *dev) { struct net_device *ndev = dev_get_drvdata(dev); struct fec_enet_private *fep = netdev_priv(ndev); @@ -2723,8 +2721,7 @@ fec_suspend(struct device *dev) return 0; } -static int -fec_resume(struct device *dev) +static int __maybe_unused fec_resume(struct device *dev) { struct net_device *ndev = dev_get_drvdata(dev); struct fec_enet_private *fep = netdev_priv(ndev); @@ -2759,7 +2756,6 @@ failed_clk: regulator_disable(fep->reg_phy); return ret; } -#endif /* CONFIG_PM_SLEEP */ static SIMPLE_DEV_PM_OPS(fec_pm_ops, fec_suspend, fec_resume);