From patchwork Mon Oct 14 23:58:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 283430 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 F0BD32C00DC for ; Tue, 15 Oct 2013 11:00:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757489Ab3JNX7Q (ORCPT ); Mon, 14 Oct 2013 19:59:16 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:43768 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756708Ab3JNX7M (ORCPT ); Mon, 14 Oct 2013 19:59:12 -0400 Received: by mail-pa0-f52.google.com with SMTP id kl14so8166791pab.39 for ; Mon, 14 Oct 2013 16:59:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=LAIRjAU1AM3ak1E7W+ULitplZA4PI1JQW/ZulGpN5ac=; b=KuyL+achaegtdUyWpGqofBrzqjs4NBx/hx1wvfUeqjie8TVm1fO0fqXUIyHitRYrKs by0uTLkSkFf2sZi+OtEL3uJYAxbDn0HJzjqt3QPo5x2AKkCRS//8j5sbtposHHAFpcB1 yhvYLOtG7nWLAHbD+XLX7W8M90wfY7xcuzpbc3zvQbO7fIpRZB62SwvYeFUm6N1XVFjv v1yDFcZJW1bQg7+CQSipbKEr9k5bJ4aytaJYO+8kOw+iFiRrSvrk92mGZFsvW4spTkJO nB4v6BH90+zhcTyf6rRw/POsIjT7xp3N+Lmqd0nsEwII+i57ol6M/nehTcG/2naWQIoh sOAQ== X-Received: by 10.68.163.33 with SMTP id yf1mr5363026pbb.143.1381795151987; Mon, 14 Oct 2013 16:59:11 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id sy10sm94301318pac.15.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 14 Oct 2013 16:59:10 -0700 (PDT) From: Soren Brinkmann To: Nicolas Ferre Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Michal Simek , Soren Brinkmann Subject: [PATCH RFC 1/5] net: macb: Migrate to dev_pm_ops Date: Mon, 14 Oct 2013 16:58:56 -0700 Message-Id: <1381795140-10792-2-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1381795140-10792-1-git-send-email-soren.brinkmann@xilinx.com> References: <1381795140-10792-1-git-send-email-soren.brinkmann@xilinx.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Migrate the suspend/resume functions to use the dev_pm_ops PM interface. Signed-off-by: Soren Brinkmann Acked-by: Nicolas Ferre --- drivers/net/ethernet/cadence/macb.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 92578690f6de..389ccf1362d5 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -1946,8 +1946,9 @@ static int __exit macb_remove(struct platform_device *pdev) } #ifdef CONFIG_PM -static int macb_suspend(struct platform_device *pdev, pm_message_t state) +static int macb_suspend(struct device *dev) { + struct platform_device *pdev = to_platform_device(dev); struct net_device *netdev = platform_get_drvdata(pdev); struct macb *bp = netdev_priv(netdev); @@ -1960,8 +1961,9 @@ static int macb_suspend(struct platform_device *pdev, pm_message_t state) return 0; } -static int macb_resume(struct platform_device *pdev) +static int macb_resume(struct device *dev) { + struct platform_device *pdev = to_platform_device(dev); struct net_device *netdev = platform_get_drvdata(pdev); struct macb *bp = netdev_priv(netdev); @@ -1972,19 +1974,17 @@ static int macb_resume(struct platform_device *pdev) return 0; } -#else -#define macb_suspend NULL -#define macb_resume NULL #endif +static SIMPLE_DEV_PM_OPS(macb_pm_ops, macb_suspend, macb_resume); + static struct platform_driver macb_driver = { .remove = __exit_p(macb_remove), - .suspend = macb_suspend, - .resume = macb_resume, .driver = { .name = "macb", .owner = THIS_MODULE, .of_match_table = of_match_ptr(macb_dt_ids), + .pm = &macb_pm_ops, }, };