From 2cadc6f2c429dd0319f7bfc44d7f7614004c58e1 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Tue, 7 Aug 2012 13:50:14 +0200
Subject: [PATCH] --- yaml --- r: 321544 b: refs/heads/master c:
 77254950bb174d637cd88d1a74e137ecf3185a65 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/base/power/clock_ops.c | 3 +--
 trunk/drivers/base/power/common.c    | 4 +---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index dc8a65a92e47..f5ba30129f25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d06a8a4fe7d81e8d1fa3d753be9b14c785b4b2e7
+refs/heads/master: 77254950bb174d637cd88d1a74e137ecf3185a65
diff --git a/trunk/drivers/base/power/clock_ops.c b/trunk/drivers/base/power/clock_ops.c
index 869d7ff2227f..eb78e9640c4a 100644
--- a/trunk/drivers/base/power/clock_ops.c
+++ b/trunk/drivers/base/power/clock_ops.c
@@ -169,8 +169,7 @@ void pm_clk_init(struct device *dev)
  */
 int pm_clk_create(struct device *dev)
 {
-	int ret = dev_pm_get_subsys_data(dev);
-	return ret < 0 ? ret : 0;
+	return dev_pm_get_subsys_data(dev);
 }
 
 /**
diff --git a/trunk/drivers/base/power/common.c b/trunk/drivers/base/power/common.c
index a14085cc613f..39c32529b833 100644
--- a/trunk/drivers/base/power/common.c
+++ b/trunk/drivers/base/power/common.c
@@ -24,7 +24,6 @@
 int dev_pm_get_subsys_data(struct device *dev)
 {
 	struct pm_subsys_data *psd;
-	int ret = 0;
 
 	psd = kzalloc(sizeof(*psd), GFP_KERNEL);
 	if (!psd)
@@ -40,7 +39,6 @@ int dev_pm_get_subsys_data(struct device *dev)
 		dev->power.subsys_data = psd;
 		pm_clk_init(dev);
 		psd = NULL;
-		ret = 1;
 	}
 
 	spin_unlock_irq(&dev->power.lock);
@@ -48,7 +46,7 @@ int dev_pm_get_subsys_data(struct device *dev)
 	/* kfree() verifies that its argument is nonzero. */
 	kfree(psd);
 
-	return ret;
+	return 0;
 }
 EXPORT_SYMBOL_GPL(dev_pm_get_subsys_data);