rjw at sisk
Nov 29, 2009, 7:19 AM
Post #4 of 4
(175 views)
Permalink
|
|
Re: [PATCH] NET: smc91x: convert to dev_pm_ops
[In reply to]
|
|
On Tuesday 24 November 2009, Kevin Hilman wrote:
> Convert smc91x driver from legacy PM hooks over to using dev_pm_ops.
>
> Tested on OMAP3 platform.
It seems to be missing the hibernation hooks, at least .freeze() and .restore(),
but I guess .thaw() as well.
> Signed-off-by: Kevin Hilman <khilman [at] deeprootsystems>
Thanks (and sorry for the late response),
Rafael
> ---
> 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,
> },
> };
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
|
