diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-04-16 05:28:29 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-16 16:30:51 -0400 |
commit | 42df36a6ef215f596fd28590358e9b59a0e3a082 (patch) | |
tree | 7ef90deccc60165227528645be31cdf036be8a1f /drivers/net/ethernet/broadcom/tg3.c | |
parent | 7b7a2bbb6904d330a142948f6b22786604a06cc6 (diff) |
tg3: 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: Nithin Nayak Sujir <nsujir@broadcom.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/broadcom/tg3.c')
-rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index ce985729f3e6..45719ddfde74 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c | |||
@@ -17533,15 +17533,9 @@ out: | |||
17533 | 17533 | ||
17534 | return err; | 17534 | return err; |
17535 | } | 17535 | } |
17536 | #endif /* CONFIG_PM_SLEEP */ | ||
17536 | 17537 | ||
17537 | static SIMPLE_DEV_PM_OPS(tg3_pm_ops, tg3_suspend, tg3_resume); | 17538 | static SIMPLE_DEV_PM_OPS(tg3_pm_ops, tg3_suspend, tg3_resume); |
17538 | #define TG3_PM_OPS (&tg3_pm_ops) | ||
17539 | |||
17540 | #else | ||
17541 | |||
17542 | #define TG3_PM_OPS NULL | ||
17543 | |||
17544 | #endif /* CONFIG_PM_SLEEP */ | ||
17545 | 17539 | ||
17546 | /** | 17540 | /** |
17547 | * tg3_io_error_detected - called when PCI error is detected | 17541 | * tg3_io_error_detected - called when PCI error is detected |
@@ -17689,7 +17683,7 @@ static struct pci_driver tg3_driver = { | |||
17689 | .probe = tg3_init_one, | 17683 | .probe = tg3_init_one, |
17690 | .remove = tg3_remove_one, | 17684 | .remove = tg3_remove_one, |
17691 | .err_handler = &tg3_err_handler, | 17685 | .err_handler = &tg3_err_handler, |
17692 | .driver.pm = TG3_PM_OPS, | 17686 | .driver.pm = &tg3_pm_ops, |
17693 | }; | 17687 | }; |
17694 | 17688 | ||
17695 | static int __init tg3_init(void) | 17689 | static int __init tg3_init(void) |