diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-04-16 05:28:28 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-16 16:30:51 -0400 |
commit | 7b7a2bbb6904d330a142948f6b22786604a06cc6 (patch) | |
tree | d0b66e5c75dc22b14dd37d1058a6d3a000f16bb4 /drivers/net/ethernet/atheros | |
parent | 4fcc999e98bc89190b051cc30932bd00d4ebe1f4 (diff) |
atl1: 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.
Cc: Jay Cliburn <jcliburn@gmail.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/atheros')
-rw-r--r-- | drivers/net/ethernet/atheros/atlx/atl1.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c index 9948fee28ae5..9843c7059b6c 100644 --- a/drivers/net/ethernet/atheros/atlx/atl1.c +++ b/drivers/net/ethernet/atheros/atlx/atl1.c | |||
@@ -2876,16 +2876,9 @@ static int atl1_resume(struct device *dev) | |||
2876 | 2876 | ||
2877 | return 0; | 2877 | return 0; |
2878 | } | 2878 | } |
2879 | #endif | ||
2879 | 2880 | ||
2880 | static SIMPLE_DEV_PM_OPS(atl1_pm_ops, atl1_suspend, atl1_resume); | 2881 | static SIMPLE_DEV_PM_OPS(atl1_pm_ops, atl1_suspend, atl1_resume); |
2881 | #define ATL1_PM_OPS (&atl1_pm_ops) | ||
2882 | |||
2883 | #else | ||
2884 | |||
2885 | static int atl1_suspend(struct device *dev) { return 0; } | ||
2886 | |||
2887 | #define ATL1_PM_OPS NULL | ||
2888 | #endif | ||
2889 | 2882 | ||
2890 | static void atl1_shutdown(struct pci_dev *pdev) | 2883 | static void atl1_shutdown(struct pci_dev *pdev) |
2891 | { | 2884 | { |
@@ -3147,7 +3140,7 @@ static struct pci_driver atl1_driver = { | |||
3147 | .probe = atl1_probe, | 3140 | .probe = atl1_probe, |
3148 | .remove = atl1_remove, | 3141 | .remove = atl1_remove, |
3149 | .shutdown = atl1_shutdown, | 3142 | .shutdown = atl1_shutdown, |
3150 | .driver.pm = ATL1_PM_OPS, | 3143 | .driver.pm = &atl1_pm_ops, |
3151 | }; | 3144 | }; |
3152 | 3145 | ||
3153 | /** | 3146 | /** |