Re: [PATCH] acerhdf: convert to dev_pm_ops

[Borislav Petkov]

> Dmitry's right, suspend() and resume() are used only for S2R. Since
> the only thing we do when suspending/hibernating is set fan speed to
> auto, we might just as well replicate those functions to .freeze() and
> .thaw().

here's a fix:

--
From: Borislav Petkov <petkovbb@xxxxxxxxx>
Date: Wed, 15 Jul 2009 17:33:32 +0200
Subject: [PATCH] acerhdf: convert to dev_pm_ops

v 1.1:
Add .freeze/.thaw func ptrs to support
suspend-to-disk, as suggested by Dmitry Torokhov.

Signed-off-by: Borislav Petkov <petkovbb@xxxxxxxxx>
---
 drivers/platform/x86/acerhdf.c |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
index aa298d6..8cd7a7b 100644
--- a/drivers/platform/x86/acerhdf.c
+++ b/drivers/platform/x86/acerhdf.c
@@ -435,7 +435,7 @@ struct thermal_cooling_device_ops acerhdf_cooling_ops = {
 };

 /* suspend / resume functionality */
-static int acerhdf_suspend(struct platform_device *dev, pm_message_t state)
+static int acerhdf_suspend(struct device *dev)
 {
 	if (kernelmode)
 		acerhdf_change_fanstate(ACERHDF_FAN_AUTO);
@@ -446,7 +446,7 @@ static int acerhdf_suspend(struct platform_device
*dev, pm_message_t state)
 	return 0;
 }

-static int acerhdf_resume(struct platform_device *device)
+static int acerhdf_resume(struct device *dev)
 {
 	if (verbose)
 		pr_notice("resuming\n");
@@ -464,15 +464,21 @@ static int acerhdf_remove(struct platform_device *device)
 	return 0;
 }

+static struct dev_pm_ops acerhdf_pm_ops = {
+	.suspend = acerhdf_suspend,
+	.resume  = acerhdf_resume,
+	.freeze  = acerhdf_suspend,
+	.thaw	 = acerhdf_resume,
+};
+
 static struct platform_driver acerhdf_driver = {
 	.driver = {
-		.name = "acerhdf",
+		.name  = "acerhdf",
 		.owner = THIS_MODULE,
+		.pm    = &acerhdf_pm_ops,
 	},
 	.probe = acerhdf_probe,
 	.remove = acerhdf_remove,
-	.suspend = acerhdf_suspend,
-	.resume = acerhdf_resume,
 };


-- 
1.6.3.3

-- 
Regards/Gruss,
Boris
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/