Skip to content

Commit

Permalink
dm9000: switch to dev_pm_ops
Browse files Browse the repository at this point in the history
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Acked-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Mike Rapoport authored and David S. Miller committed Jul 24, 2009
1 parent 5be93b9 commit 69222e2
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions drivers/net/dm9000.c
Original file line number Diff line number Diff line change
Expand Up @@ -1483,9 +1483,10 @@ dm9000_probe(struct platform_device *pdev)
}

static int
dm9000_drv_suspend(struct platform_device *dev, pm_message_t state)
dm9000_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);
board_info_t *db;

if (ndev) {
Expand All @@ -1501,9 +1502,10 @@ dm9000_drv_suspend(struct platform_device *dev, pm_message_t state)
}

static int
dm9000_drv_resume(struct platform_device *dev)
dm9000_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);
board_info_t *db = netdev_priv(ndev);

if (ndev) {
Expand All @@ -1520,6 +1522,11 @@ dm9000_drv_resume(struct platform_device *dev)
return 0;
}

static struct dev_pm_ops dm9000_drv_pm_ops = {
.suspend = dm9000_drv_suspend,
.resume = dm9000_drv_resume,
};

static int __devexit
dm9000_drv_remove(struct platform_device *pdev)
{
Expand All @@ -1539,11 +1546,10 @@ static struct platform_driver dm9000_driver = {
.driver = {
.name = "dm9000",
.owner = THIS_MODULE,
.pm = &dm9000_drv_pm_ops,
},
.probe = dm9000_probe,
.remove = __devexit_p(dm9000_drv_remove),
.suspend = dm9000_drv_suspend,
.resume = dm9000_drv_resume,
};

static int __init
Expand Down

0 comments on commit 69222e2

Please sign in to comment.