diff options
author | Anton Vorontsov <avorontsov@mvista.com> | 2010-05-14 00:27:36 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-17 20:44:35 -0400 |
commit | b14ed884df5968b0977114ebd5a22f58d0d15315 (patch) | |
tree | af0ddce77689eca82e805a027766def2e026aa8d /drivers/net/gianfar.c | |
parent | f0cd15081a72075df16c45a2310e873fb9fcd82f (diff) |
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 = { | |||
1344 | 1344 | ||
1345 | #define GFAR_PM_OPS (&gfar_pm_ops) | 1345 | #define GFAR_PM_OPS (&gfar_pm_ops) |
1346 | 1346 | ||
1347 | static int gfar_legacy_suspend(struct of_device *ofdev, pm_message_t state) | ||
1348 | { | ||
1349 | return gfar_suspend(&ofdev->dev); | ||
1350 | } | ||
1351 | |||
1352 | static int gfar_legacy_resume(struct of_device *ofdev) | ||
1353 | { | ||
1354 | return gfar_resume(&ofdev->dev); | ||
1355 | } | ||
1356 | |||
1357 | #else | 1347 | #else |
1358 | 1348 | ||
1359 | #define GFAR_PM_OPS NULL | 1349 | #define GFAR_PM_OPS NULL |
1360 | #define gfar_legacy_suspend NULL | ||
1361 | #define gfar_legacy_resume NULL | ||
1362 | 1350 | ||
1363 | #endif | 1351 | #endif |
1364 | 1352 | ||
@@ -3184,8 +3172,6 @@ static struct of_platform_driver gfar_driver = { | |||
3184 | 3172 | ||
3185 | .probe = gfar_probe, | 3173 | .probe = gfar_probe, |
3186 | .remove = gfar_remove, | 3174 | .remove = gfar_remove, |
3187 | .suspend = gfar_legacy_suspend, | ||
3188 | .resume = gfar_legacy_resume, | ||
3189 | .driver.pm = GFAR_PM_OPS, | 3175 | .driver.pm = GFAR_PM_OPS, |
3190 | }; | 3176 | }; |
3191 | 3177 | ||