Skip to content

Commit

Permalink
gianfar: Remove legacy PM callbacks
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Anton Vorontsov authored and David S. Miller committed May 18, 2010
1 parent f0cd150 commit b14ed88
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions drivers/net/gianfar.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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,
};

Expand Down

0 comments on commit b14ed88

Please sign in to comment.