aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/cadence
diff options
context:
space:
mode:
authorSoren Brinkmann <soren.brinkmann@xilinx.com>2013-12-10 19:07:19 -0500
committerDavid S. Miller <davem@davemloft.net>2013-12-10 22:56:22 -0500
commit0dfc3e1862f5e7fe369d7c20c1a1e37633b45573 (patch)
tree2f55de1646deaa9e1e66e5f827fb9c70e0f7bf8f /drivers/net/ethernet/cadence
parentfa08943b975c08697e57aff26784970dd0dd926a (diff)
net: macb: Migrate to dev_pm_ops
Migrate the suspend/resume functions to use the dev_pm_ops PM interface. Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cadence')
-rw-r--r--drivers/net/ethernet/cadence/macb.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 92578690f6de..389ccf1362d5 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -1946,8 +1946,9 @@ static int __exit macb_remove(struct platform_device *pdev)
1946} 1946}
1947 1947
1948#ifdef CONFIG_PM 1948#ifdef CONFIG_PM
1949static int macb_suspend(struct platform_device *pdev, pm_message_t state) 1949static int macb_suspend(struct device *dev)
1950{ 1950{
1951 struct platform_device *pdev = to_platform_device(dev);
1951 struct net_device *netdev = platform_get_drvdata(pdev); 1952 struct net_device *netdev = platform_get_drvdata(pdev);
1952 struct macb *bp = netdev_priv(netdev); 1953 struct macb *bp = netdev_priv(netdev);
1953 1954
@@ -1960,8 +1961,9 @@ static int macb_suspend(struct platform_device *pdev, pm_message_t state)
1960 return 0; 1961 return 0;
1961} 1962}
1962 1963
1963static int macb_resume(struct platform_device *pdev) 1964static int macb_resume(struct device *dev)
1964{ 1965{
1966 struct platform_device *pdev = to_platform_device(dev);
1965 struct net_device *netdev = platform_get_drvdata(pdev); 1967 struct net_device *netdev = platform_get_drvdata(pdev);
1966 struct macb *bp = netdev_priv(netdev); 1968 struct macb *bp = netdev_priv(netdev);
1967 1969
@@ -1972,19 +1974,17 @@ static int macb_resume(struct platform_device *pdev)
1972 1974
1973 return 0; 1975 return 0;
1974} 1976}
1975#else
1976#define macb_suspend NULL
1977#define macb_resume NULL
1978#endif 1977#endif
1979 1978
1979static SIMPLE_DEV_PM_OPS(macb_pm_ops, macb_suspend, macb_resume);
1980
1980static struct platform_driver macb_driver = { 1981static struct platform_driver macb_driver = {
1981 .remove = __exit_p(macb_remove), 1982 .remove = __exit_p(macb_remove),
1982 .suspend = macb_suspend,
1983 .resume = macb_resume,
1984 .driver = { 1983 .driver = {
1985 .name = "macb", 1984 .name = "macb",
1986 .owner = THIS_MODULE, 1985 .owner = THIS_MODULE,
1987 .of_match_table = of_match_ptr(macb_dt_ids), 1986 .of_match_table = of_match_ptr(macb_dt_ids),
1987 .pm = &macb_pm_ops,
1988 }, 1988 },
1989}; 1989};
1990 1990