Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

[cascardo/linux.git] / drivers / devfreq / devfreq-event.c

diff --git a/drivers/devfreq/devfreq-event.c b/drivers/devfreq/devfreq-event.c
index f304a02..38bf144 100644 (file)
--- a/drivers/devfreq/devfreq-event.c
+++ b/drivers/devfreq/devfreq-event.c
@@ -226,17 +226,12 @@ struct devfreq_event_dev *devfreq_event_get_edev_by_phandle(struct device *dev,
        struct device_node *node;
        struct devfreq_event_dev *edev;
 
-       if (!dev->of_node) {
-               dev_err(dev, "device does not have a device node entry\n");
+       if (!dev->of_node)
                return ERR_PTR(-EINVAL);
-       }
 
        node = of_parse_phandle(dev->of_node, "devfreq-events", index);
-       if (!node) {
-               dev_err(dev, "failed to get phandle in %s node\n",
-                       dev->of_node->full_name);
+       if (!node)
                return ERR_PTR(-ENODEV);
-       }
 
        mutex_lock(&devfreq_event_list_lock);
        list_for_each_entry(edev, &devfreq_event_list, node) {
@@ -248,8 +243,6 @@ out:
        mutex_unlock(&devfreq_event_list_lock);
 
        if (!edev) {
-               dev_err(dev, "unable to get devfreq-event device : %s\n",
-                       node->name);
                of_node_put(node);
                return ERR_PTR(-ENODEV);
        }
@@ -277,7 +270,7 @@ int devfreq_event_get_edev_count(struct device *dev)
 
        count = of_property_count_elems_of_size(dev->of_node, "devfreq-events",
                                                sizeof(u32));
-       if (count < 0 ) {
+       if (count < 0) {
                dev_err(dev,
                        "failed to get the count of devfreq-event in %s node\n",
                        dev->of_node->full_name);
@@ -402,7 +395,8 @@ struct devfreq_event_dev *devm_devfreq_event_add_edev(struct device *dev,
 {
        struct devfreq_event_dev **ptr, *edev;
 
-       ptr = devres_alloc(devm_devfreq_event_release, sizeof(*ptr), GFP_KERNEL);
+       ptr = devres_alloc(devm_devfreq_event_release, sizeof(*ptr),
+                               GFP_KERNEL);
        if (!ptr)
                return ERR_PTR(-ENOMEM);