---

yaml --- r: 195175 b: refs/heads/master c: b14ed88 h: refs/heads/master i: 195173: 4058865 195171: 5bf13cb 195167: f8f95c0 v: v3
git-mirror · May 18, 2010 · 3480f99 · 3480f99
1 parent 612d172
commit 3480f99
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0cd15081a72075df16c45a2310e873fb9fcd82f
+refs/heads/master: b14ed884df5968b0977114ebd5a22f58d0d15315
diff --git a/trunk/drivers/net/gianfar.c b/trunk/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,
 };