| Message ID | 1249496971-9019-5-git-send-email-daniel@caiaq.de |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Daniel Mack <daniel@caiaq.de> Date: Wed, 5 Aug 2009 20:29:31 +0200 > 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> Steve, if it looks good to you I can toss this into net-next-2.6 Just let me know. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
David Miller <davem@davemloft.net> wrote on 06/08/2009 04:29:22: > From: Daniel Mack <daniel@caiaq.de> > Date: Wed, 5 Aug 2009 20:29:31 +0200 > > > 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> > > Steve, if it looks good to you I can toss this into net-next-2.6 > > Just let me know. Looks fine. Compiles ok and doesn't actually change any PM implementation. Acked-by: <steve.glendinning@smsc.com> Unfortunately I can't test it. The only dev platform I have in front of me is SH7709S, which doesn't boot since 4ff29ff8e8723a41e7defd8bc78a7b16cbf940a2 (the sh maintainers are aware and working on it: http://marc.info/?l=linux-sh&m=124891631203530&w=2) Steve -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Steve.Glendinning@smsc.com Date: Thu, 6 Aug 2009 12:53:45 +0100 > David Miller <davem@davemloft.net> wrote on 06/08/2009 04:29:22: > >> From: Daniel Mack <daniel@caiaq.de> >> Date: Wed, 5 Aug 2009 20:29:31 +0200 >> >> > 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> >> >> Steve, if it looks good to you I can toss this into net-next-2.6 >> >> Just let me know. > > Looks fine. Compiles ok and doesn't actually change any PM > implementation. > > Acked-by: <steve.glendinning@smsc.com> Applied, thanks everyone. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index 94b6d26..c266785 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c @@ -50,6 +50,7 @@ #include <linux/swab.h> #include <linux/phy.h> #include <linux/smsc911x.h> +#include <linux/device.h> #include "smsc911x.h" #define SMSC_CHIPNAME "smsc911x" @@ -2114,10 +2115,12 @@ out_0: /* This implementation assumes the devices remains powered on its VDDVARIO * 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 smsc911x_data *pdata = netdev_priv(dev); + struct net_device *ndev = dev_get_drvdata(dev); + struct smsc911x_data *pdata = netdev_priv(ndev); /* enable wake on LAN, energy detection and the external PME * signal. */ @@ -2128,10 +2131,10 @@ static int smsc911x_suspend(struct platform_device *pdev, pm_message_t state) 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 smsc911x_data *pdata = netdev_priv(dev); + struct net_device *ndev = dev_get_drvdata(dev); + struct smsc911x_data *pdata = netdev_priv(ndev); unsigned int to = 100; /* Note 3.11 from the datasheet: @@ -2149,19 +2152,25 @@ static int smsc911x_resume(struct platform_device *pdev) 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 -#define smsc911x_suspend NULL -#define smsc911x_resume NULL +#define SMSC911X_PM_OPS NULL #endif static struct platform_driver smsc911x_driver = { .probe = smsc911x_drv_probe, .remove = __devexit_p(smsc911x_drv_remove), .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 */
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> Cc: Steve Glendinning <steve.glendinning@smsc.com> Cc: David S. Miller <davem@davemloft.net> Cc: netdev@vger.kernel.org --- drivers/net/smsc911x.c | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-)