lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gianfar: Remove legacy PM callbacks

Browse Source 
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>
This commit is contained in:
Anton Vorontsov
2010-05-14 04:27:36 +00:00
committed by David S. Miller
parent f0cd15081a
commit b14ed884df
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/gianfar.c
View File

@@ -1344,21 +1344,9 @@ static struct dev_pm_ops gfar_pm_ops = {
#define GFAR_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 #else
#define GFAR_PM_OPS NULL #define GFAR_PM_OPS NULL
#define gfar_legacy_suspend NULL
#define gfar_legacy_resume NULL
#endif #endif
@@ -3184,8 +3172,6 @@ static struct of_platform_driver gfar_driver = {
.probe = gfar_probe, .probe = gfar_probe,
.remove = gfar_remove, .remove = gfar_remove,
.suspend = gfar_legacy_suspend,
.resume = gfar_legacy_resume,
.driver.pm = GFAR_PM_OPS, .driver.pm = GFAR_PM_OPS,
}; };