aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2013-04-16 04:17:46 -0400
committerDavid S. Miller <davem@davemloft.net>2013-04-16 16:43:35 -0400
commitbf7bfd7ff0a8e85c5f469a24c27d4dd1eb756104 (patch)
tree880d2ae425899cb720186eaf0949f3688362c736
parent474f315d7e14be3161d207b3791113f6e6ddb82d (diff)
fec: Use SIMPLE_DEV_PM_OPS
Using SIMPLE_DEV_PM_OPS can make the code smaller and simpler. Also change CONFIG_PM to CONFIG_PM_SLEEP. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/freescale/fec_main.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index d7657a46a9eb..d4089925a5df 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1909,7 +1909,7 @@ fec_drv_remove(struct platform_device *pdev)
1909 return 0; 1909 return 0;
1910} 1910}
1911 1911
1912#ifdef CONFIG_PM 1912#ifdef CONFIG_PM_SLEEP
1913static int 1913static int
1914fec_suspend(struct device *dev) 1914fec_suspend(struct device *dev)
1915{ 1915{
@@ -1941,24 +1941,15 @@ fec_resume(struct device *dev)
1941 1941
1942 return 0; 1942 return 0;
1943} 1943}
1944#endif /* CONFIG_PM_SLEEP */
1944 1945
1945static const struct dev_pm_ops fec_pm_ops = { 1946static SIMPLE_DEV_PM_OPS(fec_pm_ops, fec_suspend, fec_resume);
1946 .suspend = fec_suspend,
1947 .resume = fec_resume,
1948 .freeze = fec_suspend,
1949 .thaw = fec_resume,
1950 .poweroff = fec_suspend,
1951 .restore = fec_resume,
1952};
1953#endif
1954 1947
1955static struct platform_driver fec_driver = { 1948static struct platform_driver fec_driver = {
1956 .driver = { 1949 .driver = {
1957 .name = DRIVER_NAME, 1950 .name = DRIVER_NAME,
1958 .owner = THIS_MODULE, 1951 .owner = THIS_MODULE,
1959#ifdef CONFIG_PM
1960 .pm = &fec_pm_ops, 1952 .pm = &fec_pm_ops,
1961#endif
1962 .of_match_table = fec_dt_ids, 1953 .of_match_table = fec_dt_ids,
1963 }, 1954 },
1964 .id_table = fec_devtype, 1955 .id_table = fec_devtype,