diff options
| author | Kevin Hilman <khilman@deeprootsystems.com> | 2009-11-24 12:57:47 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-29 00:21:29 -0800 |
| commit | 9f950f72e57fe4bf9b16ace67e4cc5ffcee79d00 (patch) | |
| tree | cb6c1411f650c13613cfa9a7558b23f127b239bc /drivers/net/smc91x.c | |
| parent | 5656b6ca19c602a7074effae360e5a4dcfdc8170 (diff) | |
| download | blackbird-op-linux-9f950f72e57fe4bf9b16ace67e4cc5ffcee79d00.tar.gz blackbird-op-linux-9f950f72e57fe4bf9b16ace67e4cc5ffcee79d00.zip | |
NET: smc91x: convert to dev_pm_ops
Convert smc91x driver from legacy PM hooks over to using dev_pm_ops.
Tested on OMAP3 platform.
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/smc91x.c')
| -rw-r--r-- | 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 0b56ab468d28..2ab90260d4a6 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, }, }; |
