Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4fdcd92 authored by chaithrika@ti.com's avatar chaithrika@ti.com Committed by David S. Miller
Browse files

TI DaVinci EMAC: Convert to dev_pm_ops 



Migrate from the legacy PM hooks to use dev_pm_ops structure.

Signed-off-by: default avatarChaithrika U S <chaithrika@ti.com>
Acked-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent be5bce2b

drivers/net/davinci_emac.c

+16 −11
Original line number Diff line number Diff line
@@ -2827,31 +2827,37 @@ static int __devexit davinci_emac_remove(struct platform_device *pdev) 
	return 0;

}



static

int davinci_emac_suspend(struct platform_device *pdev, pm_message_t state)

static int davinci_emac_suspend(struct device *dev)

{

	struct net_device *dev = platform_get_drvdata(pdev);

	struct platform_device *pdev = to_platform_device(dev);

	struct net_device *ndev = platform_get_drvdata(pdev);



	if (netif_running(dev))

		emac_dev_stop(dev);

	if (netif_running(ndev))

		emac_dev_stop(ndev);



	clk_disable(emac_clk);



	return 0;

}



static int davinci_emac_resume(struct platform_device *pdev)

static int davinci_emac_resume(struct device *dev)

{

	struct net_device *dev = platform_get_drvdata(pdev);

	struct platform_device *pdev = to_platform_device(dev);

	struct net_device *ndev = platform_get_drvdata(pdev);



	clk_enable(emac_clk);



	if (netif_running(dev))

		emac_dev_open(dev);

	if (netif_running(ndev))

		emac_dev_open(ndev);



	return 0;

}



static const struct dev_pm_ops davinci_emac_pm_ops = {

	.suspend	= davinci_emac_suspend,

	.resume		= davinci_emac_resume,

};



/**

 * davinci_emac_driver: EMAC platform driver structure

 */
@@ -2859,11 +2865,10 @@ static struct platform_driver davinci_emac_driver = { 
	.driver = {

		.name	 = "davinci_emac",

		.owner	 = THIS_MODULE,

		.pm	 = &davinci_emac_pm_ops,

	},

	.probe = davinci_emac_probe,

	.remove = __devexit_p(davinci_emac_remove),

	.suspend = davinci_emac_suspend,

	.resume = davinci_emac_resume,

};



/**