semc: enabled pm_ops (still buggy)

CMX10 · Jan 27, 2012 · 98552b8 · 98552b8
1 parent f20eaf1
commit 98552b8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
@@ -116,7 +116,7 @@ void device_pm_remove(struct device *dev)
  *	@ops:	PM operations to choose from.
  *	@state:	PM transition of the system being carried out.
  */
-static int pm_op(struct device *dev, struct dev_pm_ops *ops,
+static int pm_op(struct device *dev, const struct dev_pm_ops *ops,
 			pm_message_t state)
 {
 	int error = 0;
@@ -179,7 +179,7 @@ static int pm_op(struct device *dev, struct dev_pm_ops *ops,
  *	The operation is executed with interrupts disabled by the only remaining
  *	functional CPU in the system.
  */
-static int pm_noirq_op(struct device *dev, struct dev_pm_ops *ops,
+static int pm_noirq_op(struct device *dev, const struct dev_pm_ops *ops,
 			pm_message_t state)
 {
 	int error = 0;

diff --git a/drivers/char/msm_kgsl/kgsl_yamato.c b/drivers/char/msm_kgsl/kgsl_yamato.c
@@ -1325,7 +1325,7 @@ static struct platform_driver kgsl_3d_platform_driver = {
 	.driver = {
 		.owner = THIS_MODULE,
 		.name = DEVICE_3D_NAME,
-//		.pm = &kgsl_pm_ops,
+		.pm = &kgsl_pm_ops,
 	}
 };
 

diff --git a/include/linux/device.h b/include/linux/device.h
@@ -65,7 +65,7 @@ struct bus_type {
 	int (*resume_early)(struct device *dev);
 	int (*resume)(struct device *dev);
 
-	struct dev_pm_ops *pm;
+	const struct dev_pm_ops *pm;
 
 	struct bus_type_private *p;
 };
@@ -133,7 +133,7 @@ struct device_driver {
 	int (*resume) (struct device *dev);
 	struct attribute_group **groups;
 
-	struct dev_pm_ops *pm;
+	const struct dev_pm_ops *pm;
 
 	struct driver_private *p;
 };
@@ -200,7 +200,7 @@ struct class {
 	int (*suspend)(struct device *dev, pm_message_t state);
 	int (*resume)(struct device *dev);
 
-	struct dev_pm_ops *pm;
+	const struct dev_pm_ops *pm;
 	struct class_private *p;
 };
 
@@ -293,7 +293,7 @@ struct device_type {
 	int (*suspend)(struct device *dev, pm_message_t state);
 	int (*resume)(struct device *dev);
 
-	struct dev_pm_ops *pm;
+	const struct dev_pm_ops *pm;
 };
 
 /* interface for exporting device attributes */