From patchwork Tue Nov 24 22:57:47 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 39253 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 35F5DB6F0D for ; Wed, 25 Nov 2009 09:58:19 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934355AbZKXW5o (ORCPT ); Tue, 24 Nov 2009 17:57:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S934337AbZKXW5o (ORCPT ); Tue, 24 Nov 2009 17:57:44 -0500 Received: from mail-px0-f180.google.com ([209.85.216.180]:59542 "EHLO mail-px0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934281AbZKXW5n (ORCPT ); Tue, 24 Nov 2009 17:57:43 -0500 Received: by pxi10 with SMTP id 10so5282769pxi.33 for ; Tue, 24 Nov 2009 14:57:49 -0800 (PST) Received: by 10.114.236.22 with SMTP id j22mr805884wah.217.1259103469623; Tue, 24 Nov 2009 14:57:49 -0800 (PST) Received: from localhost ([216.254.16.51]) by mx.google.com with ESMTPS id 21sm884818pzk.15.2009.11.24.14.57.48 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 24 Nov 2009 14:57:48 -0800 (PST) From: Kevin Hilman To: Nicolas Pitre , "David S. Miller" , netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH] NET: smc91x: convert to dev_pm_ops Date: Tue, 24 Nov 2009 14:57:47 -0800 Message-Id: <1259103467-31016-1-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.5.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Convert smc91x driver from legacy PM hooks over to using dev_pm_ops. Tested on OMAP3 platform. Signed-off-by: Kevin Hilman Acked-by: Nicolas Pitre --- drivers/net/smc91x.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index 05c91ee..8e4c455 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c @@ -2365,9 +2365,10 @@ static int __devexit smc_drv_remove(struct platform_device *pdev) return 0; } -static int smc_drv_suspend(struct platform_device *dev, pm_message_t state) +static int smc_drv_suspend(struct device *dev) { - struct net_device *ndev = platform_get_drvdata(dev); + struct platform_device *pdev = to_platform_device(dev); + struct net_device *ndev = platform_get_drvdata(pdev); if (ndev) { if (netif_running(ndev)) { @@ -2379,9 +2380,10 @@ static int smc_drv_suspend(struct platform_device *dev, pm_message_t state) return 0; } -static int smc_drv_resume(struct platform_device *dev) +static int smc_drv_resume(struct device *dev) { - struct net_device *ndev = platform_get_drvdata(dev); + struct platform_device *pdev = to_platform_device(dev); + struct net_device *ndev = platform_get_drvdata(pdev); if (ndev) { struct smc_local *lp = netdev_priv(ndev); @@ -2397,14 +2399,18 @@ static int smc_drv_resume(struct platform_device *dev) return 0; } +static struct dev_pm_ops smc_drv_pm_ops = { + .suspend = smc_drv_suspend, + .resume = smc_drv_resume, +}; + static struct platform_driver smc_driver = { .probe = smc_drv_probe, .remove = __devexit_p(smc_drv_remove), - .suspend = smc_drv_suspend, - .resume = smc_drv_resume, .driver = { .name = CARDNAME, .owner = THIS_MODULE, + .pm = &smc_drv_pm_ops, }, };