Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net: smsc911x: switch to new dev_pm_ops

Browse source 
Hibernation is unsupported for now, which meets the actual
implementation in the driver. For free/thaw, the chip's D2 state should
be entered.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Acked-by: <steve.glendinning@smsc.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Daniel Mack 2009-08-05 08:29:31 +00:00 committed by David S. Miller
parent a48ec346fc
commit 6cb8782362
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/net/smsc911x.c
View file

@ -50,6 +50,7 @@
#include <linux/swab.h> #include <linux/swab.h>
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/smsc911x.h> #include <linux/smsc911x.h>
#include <linux/device.h>
#include "smsc911x.h" #include "smsc911x.h"
#define SMSC_CHIPNAME "smsc911x" #define SMSC_CHIPNAME "smsc911x"
@ -2114,10 +2115,12 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)
/* This implementation assumes the devices remains powered on its VDDVARIO /* This implementation assumes the devices remains powered on its VDDVARIO
* pins during suspend. */ * pins during suspend. */
static int smsc911x_suspend(struct platform_device *pdev, pm_message_t state) /* TODO: implement freeze/thaw callbacks for hibernation.*/
static int smsc911x_suspend(struct device *dev)
{ {
struct net_device *dev = platform_get_drvdata(pdev); struct net_device *ndev = dev_get_drvdata(dev);
struct smsc911x_data *pdata = netdev_priv(dev); struct smsc911x_data *pdata = netdev_priv(ndev);
/* enable wake on LAN, energy detection and the external PME /* enable wake on LAN, energy detection and the external PME
* signal. */ * signal. */
@ -2128,10 +2131,10 @@ static int smsc911x_suspend(struct platform_device *pdev, pm_message_t state)
return 0; return 0;
} }
static int smsc911x_resume(struct platform_device *pdev) static int smsc911x_resume(struct device *dev)
{ {
struct net_device *dev = platform_get_drvdata(pdev); struct net_device *ndev = dev_get_drvdata(dev);
struct smsc911x_data *pdata = netdev_priv(dev); struct smsc911x_data *pdata = netdev_priv(ndev);
unsigned int to = 100; unsigned int to = 100;
/* Note 3.11 from the datasheet: /* Note 3.11 from the datasheet:
@ -2149,19 +2152,25 @@ static int smsc911x_resume(struct platform_device *pdev)
return (to == 0) ? -EIO : 0; return (to == 0) ? -EIO : 0;
} }
static struct dev_pm_ops smsc911x_pm_ops = {
.suspend = smsc911x_suspend,
.resume = smsc911x_resume,
};
#define SMSC911X_PM_OPS (&smsc911x_pm_ops)
#else #else
#define smsc911x_suspend NULL #define SMSC911X_PM_OPS NULL
#define smsc911x_resume NULL
#endif #endif
static struct platform_driver smsc911x_driver = { static struct platform_driver smsc911x_driver = {
.probe = smsc911x_drv_probe, .probe = smsc911x_drv_probe,
.remove = __devexit_p(smsc911x_drv_remove), .remove = __devexit_p(smsc911x_drv_remove),
.driver = { .driver = {
.name = SMSC_CHIPNAME, .name = SMSC_CHIPNAME,
.owner = THIS_MODULE,
.pm = SMSC911X_PM_OPS,
}, },
.suspend = smsc911x_suspend,
.resume = smsc911x_resume,
}; };
/* Entry point for loading the module */ /* Entry point for loading the module */