Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

* 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (76 commits)
  PM / Hibernate: Implement compat_ioctl for /dev/snapshot
  PM / Freezer: fix return value of freezable_schedule_timeout_killable()
  PM / shmobile: Allow the A4R domain to be turned off at run time
  PM / input / touchscreen: Make st1232 use device PM QoS constraints
  PM / QoS: Introduce dev_pm_qos_add_ancestor_request()
  PM / shmobile: Remove the stay_on flag from SH7372's PM domains
  PM / shmobile: Don't include SH7372's INTCS in syscore suspend/resume
  PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode
  PM: Drop generic_subsys_pm_ops
  PM / Sleep: Remove forward-only callbacks from AMBA bus type
  PM / Sleep: Remove forward-only callbacks from platform bus type
  PM: Run the driver callback directly if the subsystem one is not there
  PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers
  PM/Devfreq: Add Exynos4-bus device DVFS driver for Exynos4210/4212/4412.
  PM / Sleep: Merge internal functions in generic_ops.c
  PM / Sleep: Simplify generic system suspend callbacks
  PM / Hibernate: Remove deprecated hibernation snapshot ioctls
  PM / Sleep: Fix freezer failures due to racy usermodehelper_is_disabled()
  ARM: S3C64XX: Implement basic power domain support
  PM / shmobile: Use common always on power domain governor
  ...

Fix up trivial conflict in fs/xfs/xfs_buf.c due to removal of unused
XBT_FORCE_SLEEP bit

1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index 59d24e9cb8c5..c189b82f5ece 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -347,7 +347,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
                 if (!IS_ERR(devfreq)) {
                         dev_err(dev, "%s: Unable to create devfreq for the device. It already has one.\n", __func__);
                         err = -EINVAL;
-                        goto out;
+                        goto err_out;
                 }
         }
 
@@ -356,7 +356,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
                 dev_err(dev, "%s: Unable to create devfreq for the device\n",
                         __func__);
                 err = -ENOMEM;
-                goto out;
+                goto err_out;
         }
 
         mutex_init(&devfreq->lock);
@@ -399,17 +399,16 @@ struct devfreq *devfreq_add_device(struct device *dev,
                                    devfreq->next_polling);
         }
         mutex_unlock(&devfreq_list_lock);
-        goto out;
+out:
+        return devfreq;
+
 err_init:
         device_unregister(&devfreq->dev);
 err_dev:
         mutex_unlock(&devfreq->lock);
         kfree(devfreq);
-out:
-        if (err)
-                return ERR_PTR(err);
-        else
-                return devfreq;
+err_out:
+        return ERR_PTR(err);
 }
 
 /**