aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2013-04-16 05:28:30 -0400
committerDavid S. Miller <davem@davemloft.net>2013-04-16 16:30:51 -0400
commitc132cf56f1527d4667b52bf64453155bcacbea8a (patch)
tree27691ef16cffbfc768cce79a62934b81e0fe6df2 /drivers
parent42df36a6ef215f596fd28590358e9b59a0e3a082 (diff)
xgmac: Remove unneeded PM_OPS definitions
SIMPLE_DEV_PM_OPS macro can handle !CONFIG_PM_SLEEP case nicely, so there is no need to define PM_OPS for both CONFIG_PM_SLEEP and !CONFIG_PM_SLEEP cases. Remove the unneeded definitions. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/calxeda/xgmac.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c
index b0ebc9f6d55e..791e5ff305d8 100644
--- a/drivers/net/ethernet/calxeda/xgmac.c
+++ b/drivers/net/ethernet/calxeda/xgmac.c
@@ -1886,12 +1886,9 @@ static int xgmac_resume(struct device *dev)
1886 1886
1887 return 0; 1887 return 0;
1888} 1888}
1889#endif /* CONFIG_PM_SLEEP */
1889 1890
1890static SIMPLE_DEV_PM_OPS(xgmac_pm_ops, xgmac_suspend, xgmac_resume); 1891static SIMPLE_DEV_PM_OPS(xgmac_pm_ops, xgmac_suspend, xgmac_resume);
1891#define XGMAC_PM_OPS (&xgmac_pm_ops)
1892#else
1893#define XGMAC_PM_OPS NULL
1894#endif /* CONFIG_PM_SLEEP */
1895 1892
1896static const struct of_device_id xgmac_of_match[] = { 1893static const struct of_device_id xgmac_of_match[] = {
1897 { .compatible = "calxeda,hb-xgmac", }, 1894 { .compatible = "calxeda,hb-xgmac", },
@@ -1906,7 +1903,7 @@ static struct platform_driver xgmac_driver = {
1906 }, 1903 },
1907 .probe = xgmac_probe, 1904 .probe = xgmac_probe,
1908 .remove = xgmac_remove, 1905 .remove = xgmac_remove,
1909 .driver.pm = XGMAC_PM_OPS, 1906 .driver.pm = &xgmac_pm_ops,
1910}; 1907};
1911 1908
1912module_platform_driver(xgmac_driver); 1909module_platform_driver(xgmac_driver);