diff options
| author | Anton Vorontsov <avorontsov@mvista.com> | 2010-05-14 04:27:36 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-17 17:44:35 -0700 |
| commit | b14ed884df5968b0977114ebd5a22f58d0d15315 (patch) | |
| tree | af0ddce77689eca82e805a027766def2e026aa8d /drivers/net/gianfar.c | |
| parent | f0cd15081a72075df16c45a2310e873fb9fcd82f (diff) | |
| download | linux-b14ed884df5968b0977114ebd5a22f58d0d15315.tar.gz | |
gianfar: Remove legacy PM callbacks
These callbacks were needed because dev_pm_ops support for OF platform devices was in the powerpc tree, and the patch that added dev_pm_ops for gianfar driver was in the netdev tree. Now that netdev and powerpc trees have merged into Linus' tree, we can remove the legacy hooks. Signed-off-by: Anton Vorontsov <avorontsov@mvista.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/gianfar.c')
| -rw-r--r-- | drivers/net/gianfar.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 43db5ab8ba3d..c6791cd4ee05 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -1344,21 +1344,9 @@ static struct dev_pm_ops gfar_pm_ops = { #define GFAR_PM_OPS (&gfar_pm_ops) -static int gfar_legacy_suspend(struct of_device *ofdev, pm_message_t state) -{ - return gfar_suspend(&ofdev->dev); -} - -static int gfar_legacy_resume(struct of_device *ofdev) -{ - return gfar_resume(&ofdev->dev); -} - #else #define GFAR_PM_OPS NULL -#define gfar_legacy_suspend NULL -#define gfar_legacy_resume NULL #endif @@ -3184,8 +3172,6 @@ static struct of_platform_driver gfar_driver = { .probe = gfar_probe, .remove = gfar_remove, - .suspend = gfar_legacy_suspend, - .resume = gfar_legacy_resume, .driver.pm = GFAR_PM_OPS, }; |