Merge tag 'driver-core-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core updates from Greg KH:
 "Here's the driver-core / kobject / lz4 tree update for 4.1-rc1.

  Everything here has been in linux-next for a while with no reported
  issues.  It's mostly just coding style cleanups, with other minor
  changes in here as well, nothing big"

* tag 'driver-core-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (32 commits)
  debugfs: allow bad parent pointers to be passed in
  stable_kernel_rules: Add clause about specification of kernel versions to patch.
  kobject: WARN as tip when call kobject_get() to a kobject not initialized
  lib/lz4: Pull out constant tables
  drivers: platform: parse IRQ flags from resources
  driver core: Make probe deferral more quiet
  drivers/core/of: Add symlink to device-tree from devices with an OF node
  device: Add dev_of_node() accessor
  drivers: base: fw: fix ret value when loading fw
  firmware: Avoid manual device_create_file() calls
  drivers/base: cacheinfo: validate device node for all the caches
  drivers/base: use tabs where possible in code indentation
  driver core: add missing blank line after declaration
  drivers: base: node: Delete space after pointer declaration
  drivers: base: memory: Use tabs instead of spaces
  firmware_class: Fix whitespace and indentation
  drivers: base: dma-mapping: Erase blank space after pointer
  drivers: base: class: Add a blank line after declarations
  attribute_container: fix missing blank lines after declarations
  drivers: base: memory: Fix switch indent
  ...

15 files changed, 129 insertions, 89 deletions

diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index 3ead3af4be61..2ba4cac080c5 100644
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -94,6 +94,7 @@ int
 attribute_container_unregister(struct attribute_container *cont)
 {
         int retval = -EBUSY;
+
         mutex_lock(&attribute_container_mutex);
         spin_lock(&cont->containers.k_lock);
         if (!list_empty(&cont->containers.k_list))
@@ -349,6 +350,7 @@ int
 attribute_container_add_class_device(struct device *classdev)
 {
         int error = device_add(classdev);
+
         if (error)
                 return error;
         return attribute_container_add_attrs(classdev);
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 876bae5ade33..79bc203f51ef 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -515,11 +515,11 @@ int bus_add_device(struct device *dev)
                         goto out_put;
                 error = device_add_groups(dev, bus->dev_groups);
                 if (error)
-                        goto out_groups;
+                        goto out_id;
                 error = sysfs_create_link(&bus->p->devices_kset->kobj,
                                                 &dev->kobj, dev_name(dev));
                 if (error)
-                        goto out_id;
+                        goto out_groups;
                 error = sysfs_create_link(&dev->kobj,
                                 &dev->bus->p->subsys.kobj, "subsystem");
                 if (error)
diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
index 6e64563361f0..9c2ba1c97c42 100644
--- a/drivers/base/cacheinfo.c
+++ b/drivers/base/cacheinfo.c
@@ -62,15 +62,21 @@ static int cache_setup_of_node(unsigned int cpu)
                 return -ENOENT;
         }
 
-        while (np && index < cache_leaves(cpu)) {
+        while (index < cache_leaves(cpu)) {
                 this_leaf = this_cpu_ci->info_list + index;
                 if (this_leaf->level != 1)
                         np = of_find_next_cache_node(np);
                 else
                         np = of_node_get(np);/* cpu node itself */
+                if (!np)
+                        break;
                 this_leaf->of_node = np;
                 index++;
         }
+
+        if (index != cache_leaves(cpu)) /* not all OF nodes populated */
+                return -ENOENT;
+
         return 0;
 }
 
@@ -189,8 +195,11 @@ static int detect_cache_attributes(unsigned int cpu)
          * will be set up here only if they are not populated already
          */
         ret = cache_shared_cpu_map_setup(cpu);
-        if (ret)
+        if (ret) {
+                pr_warn("Unable to detect cache hierarcy from DT for CPU %d\n",
+                        cpu);
                 goto free_ci;
+        }
         return 0;
 
 free_ci:
diff --git a/drivers/base/class.c b/drivers/base/class.c
index f96f70419a78..6e810881e48b 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -90,6 +90,7 @@ int class_create_file_ns(struct class *cls, const struct class_attribute *attr,
                          const void *ns)
 {
         int error;
+
         if (cls)
                 error = sysfs_create_file_ns(&cls->p->subsys.kobj,
                                              &attr->attr, ns);
@@ -488,6 +489,7 @@ ssize_t show_class_attr_string(struct class *class,
                                struct class_attribute *attr, char *buf)
 {
         struct class_attribute_string *cs;
+
         cs = container_of(attr, struct class_attribute_string, attr);
         return snprintf(buf, PAGE_SIZE, "%s\n", cs->str);
 }
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 07304a3b9ee2..cadf165651d8 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -805,8 +805,16 @@ static void cleanup_device_parent(struct device *dev)
 
 static int device_add_class_symlinks(struct device *dev)
 {
+        struct device_node *of_node = dev_of_node(dev);
         int error;
 
+        if (of_node) {
+                error = sysfs_create_link(&dev->kobj, &of_node->kobj,"of_node");
+                if (error)
+                        dev_warn(dev, "Error %d creating of_node link\n",error);
+                /* An error here doesn't warrant bringing down the device */
+        }
+
         if (!dev->class)
                 return 0;
 
@@ -814,7 +822,7 @@ static int device_add_class_symlinks(struct device *dev)
                                   &dev->class->p->subsys.kobj,
                                   "subsystem");
         if (error)
-                goto out;
+                goto out_devnode;
 
         if (dev->parent && device_is_not_partition(dev)) {
                 error = sysfs_create_link(&dev->kobj, &dev->parent->kobj,
@@ -842,12 +850,16 @@ out_device:
 
 out_subsys:
         sysfs_remove_link(&dev->kobj, "subsystem");
-out:
+out_devnode:
+        sysfs_remove_link(&dev->kobj, "of_node");
         return error;
 }
 
 static void device_remove_class_symlinks(struct device *dev)
 {
+        if (dev_of_node(dev))
+                sysfs_remove_link(&dev->kobj, "of_node");
+
         if (!dev->class)
                 return;
 
@@ -1095,8 +1107,7 @@ done:
         kobject_del(&dev->kobj);
  Error:
         cleanup_device_parent(dev);
-        if (parent)
-                put_device(parent);
+        put_device(parent);
 name_error:
         kfree(dev->p);
         dev->p = NULL;
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index cdc779cf79a3..49a4a12fafef 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -320,21 +320,25 @@ probe_failed:
         dev->driver = NULL;
         dev_set_drvdata(dev, NULL);
 
-        if (ret == -EPROBE_DEFER) {
+        switch (ret) {
+        case -EPROBE_DEFER:
                 /* Driver requested deferred probing */
-                dev_info(dev, "Driver %s requests probe deferral\n", drv->name);
+                dev_dbg(dev, "Driver %s requests probe deferral\n", drv->name);
                 driver_deferred_probe_add(dev);
                 /* Did a trigger occur while probing? Need to re-trigger if yes */
                 if (local_trigger_count != atomic_read(&deferred_trigger_count))
                         driver_deferred_probe_trigger();
-        } else if (ret != -ENODEV && ret != -ENXIO) {
+                break;
+        case -ENODEV:
+        case -ENXIO:
+                pr_debug("%s: probe of %s rejects match %d\n",
+                         drv->name, dev_name(dev), ret);
+                break;
+        default:
                 /* driver matched but the probe failed */
                 printk(KERN_WARNING
                        "%s: probe of %s failed with error %d\n",
                        drv->name, dev_name(dev), ret);
-        } else {
-                pr_debug("%s: probe of %s rejects match %d\n",
-                       drv->name, dev_name(dev), ret);
         }
         /*
          * Ignore errors returned by ->probe so that the next driver can try
diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c
index 9e8bbdd470ca..d95c5971c225 100644
--- a/drivers/base/dma-mapping.c
+++ b/drivers/base/dma-mapping.c
@@ -62,7 +62,7 @@ static int dmam_match(struct device *dev, void *res, void *match_data)
  * RETURNS:
  * Pointer to allocated memory on success, NULL on failure.
  */
-void * dmam_alloc_coherent(struct device *dev, size_t size,
+void *dmam_alloc_coherent(struct device *dev, size_t size,
                            dma_addr_t *dma_handle, gfp_t gfp)
 {
         struct dma_devres *dr;
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 9e29943e56ca..4eabfe28d2b3 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -103,6 +103,7 @@ int driver_create_file(struct device_driver *drv,
                        const struct driver_attribute *attr)
 {
         int error;
+
         if (drv)
                 error = sysfs_create_file(&drv->p->kobj, &attr->attr);
         else
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 6c5c9edf5ff6..171841ad1008 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -181,7 +181,7 @@ static struct firmware_buf *__allocate_fw_buf(const char *fw_name,
 {
         struct firmware_buf *buf;
 
-        buf = kzalloc(sizeof(*buf) + strlen(fw_name) + 1 , GFP_ATOMIC);
+        buf = kzalloc(sizeof(*buf) + strlen(fw_name) + 1, GFP_ATOMIC);
 
         if (!buf)
                 return buf;
@@ -835,6 +835,26 @@ static struct bin_attribute firmware_attr_data = {
         .write = firmware_data_write,
 };
 
+static struct attribute *fw_dev_attrs[] = {
+        &dev_attr_loading.attr,
+        NULL
+};
+
+static struct bin_attribute *fw_dev_bin_attrs[] = {
+        &firmware_attr_data,
+        NULL
+};
+
+static const struct attribute_group fw_dev_attr_group = {
+        .attrs = fw_dev_attrs,
+        .bin_attrs = fw_dev_bin_attrs,
+};
+
+static const struct attribute_group *fw_dev_attr_groups[] = {
+        &fw_dev_attr_group,
+        NULL
+};
+
 static struct firmware_priv *
 fw_create_instance(struct firmware *firmware, const char *fw_name,
                    struct device *device, unsigned int opt_flags)
@@ -856,6 +876,7 @@ fw_create_instance(struct firmware *firmware, const char *fw_name,
         dev_set_name(f_dev, "%s", fw_name);
         f_dev->parent = device;
         f_dev->class = &firmware_class;
+        f_dev->groups = fw_dev_attr_groups;
 exit:
         return fw_priv;
 }
@@ -879,25 +900,10 @@ static int _request_firmware_load(struct firmware_priv *fw_priv,
                 goto err_put_dev;
         }
 
-        retval = device_create_bin_file(f_dev, &firmware_attr_data);
-        if (retval) {
-                dev_err(f_dev, "%s: sysfs_create_bin_file failed\n", __func__);
-                goto err_del_dev;
-        }
-
         mutex_lock(&fw_lock);
         list_add(&buf->pending_list, &pending_fw_head);
         mutex_unlock(&fw_lock);
 
-        retval = device_create_file(f_dev, &dev_attr_loading);
-        if (retval) {
-                mutex_lock(&fw_lock);
-                list_del_init(&buf->pending_list);
-                mutex_unlock(&fw_lock);
-                dev_err(f_dev, "%s: device_create_file failed\n", __func__);
-                goto err_del_bin_attr;
-        }
-
         if (opt_flags & FW_OPT_UEVENT) {
                 buf->need_uevent = true;
                 dev_set_uevent_suppress(f_dev, false);
@@ -913,6 +919,8 @@ static int _request_firmware_load(struct firmware_priv *fw_priv,
                 mutex_lock(&fw_lock);
                 fw_load_abort(fw_priv);
                 mutex_unlock(&fw_lock);
+        } else if (retval > 0) {
+                retval = 0;
         }
 
         if (is_fw_load_aborted(buf))
@@ -920,10 +928,6 @@ static int _request_firmware_load(struct firmware_priv *fw_priv,
         else if (!buf->data)
                 retval = -ENOMEM;
 
-        device_remove_file(f_dev, &dev_attr_loading);
-err_del_bin_attr:
-        device_remove_bin_file(f_dev, &firmware_attr_data);
-err_del_dev:
         device_del(f_dev);
 err_put_dev:
         put_device(f_dev);
@@ -1168,7 +1172,7 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
  **/
 int
 request_firmware(const struct firmware **firmware_p, const char *name,
-                 struct device *device)
+                 struct device *device)
 {
         int ret;
 
@@ -1196,6 +1200,7 @@ int request_firmware_direct(const struct firmware **firmware_p,
                             const char *name, struct device *device)
 {
         int ret;
+
         __module_get(THIS_MODULE);
         ret = _request_firmware(firmware_p, name, device,
                                 FW_OPT_UEVENT | FW_OPT_NO_WARN);
@@ -1276,7 +1281,7 @@ request_firmware_nowait(
 {
         struct firmware_work *fw_work;
 
-        fw_work = kzalloc(sizeof (struct firmware_work), gfp);
+        fw_work = kzalloc(sizeof(struct firmware_work), gfp);
         if (!fw_work)
                 return -ENOMEM;
 
diff --git a/drivers/base/map.c b/drivers/base/map.c
index e87017f36853..c1d38234d725 100644
--- a/drivers/base/map.c
+++ b/drivers/base/map.c
@@ -41,8 +41,7 @@ int kobj_map(struct kobj_map *domain, dev_t dev, unsigned long range,
         if (n > 255)
                 n = 255;
 
-        p = kmalloc(sizeof(struct probe) * n, GFP_KERNEL);
-
+        p = kmalloc_array(n, sizeof(struct probe), GFP_KERNEL);
         if (p == NULL)
                 return -ENOMEM;
 
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 85be040a21c8..af9c911cd6b5 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -52,13 +52,13 @@ static BLOCKING_NOTIFIER_HEAD(memory_chain);
 
 int register_memory_notifier(struct notifier_block *nb)
 {
-        return blocking_notifier_chain_register(&memory_chain, nb);
+        return blocking_notifier_chain_register(&memory_chain, nb);
 }
 EXPORT_SYMBOL(register_memory_notifier);
 
 void unregister_memory_notifier(struct notifier_block *nb)
 {
-        blocking_notifier_chain_unregister(&memory_chain, nb);
+        blocking_notifier_chain_unregister(&memory_chain, nb);
 }
 EXPORT_SYMBOL(unregister_memory_notifier);
 
@@ -152,20 +152,20 @@ static ssize_t show_mem_state(struct device *dev,
          * so that they're not open-coded
          */
         switch (mem->state) {
-                case MEM_ONLINE:
-                        len = sprintf(buf, "online\n");
-                        break;
-                case MEM_OFFLINE:
-                        len = sprintf(buf, "offline\n");
-                        break;
-                case MEM_GOING_OFFLINE:
-                        len = sprintf(buf, "going-offline\n");
-                        break;
-                default:
-                        len = sprintf(buf, "ERROR-UNKNOWN-%ld\n",
-                                        mem->state);
-                        WARN_ON(1);
-                        break;
+        case MEM_ONLINE:
+                len = sprintf(buf, "online\n");
+                break;
+        case MEM_OFFLINE:
+                len = sprintf(buf, "offline\n");
+                break;
+        case MEM_GOING_OFFLINE:
+                len = sprintf(buf, "going-offline\n");
+                break;
+        default:
+                len = sprintf(buf, "ERROR-UNKNOWN-%ld\n",
+                                mem->state);
+                WARN_ON(1);
+                break;
         }
 
         return len;
@@ -232,19 +232,19 @@ memory_block_action(unsigned long phys_index, unsigned long action, int online_t
         first_page = pfn_to_page(start_pfn);
 
         switch (action) {
-                case MEM_ONLINE:
-                        if (!pages_correctly_reserved(start_pfn))
-                                return -EBUSY;
-
-                        ret = online_pages(start_pfn, nr_pages, online_type);
-                        break;
-                case MEM_OFFLINE:
-                        ret = offline_pages(start_pfn, nr_pages);
-                        break;
-                default:
-                        WARN(1, KERN_WARNING "%s(%ld, %ld) unknown action: "
-                             "%ld\n", __func__, phys_index, action, action);
-                        ret = -EINVAL;
+        case MEM_ONLINE:
+                if (!pages_correctly_reserved(start_pfn))
+                        return -EBUSY;
+
+                ret = online_pages(start_pfn, nr_pages, online_type);
+                break;
+        case MEM_OFFLINE:
+                ret = offline_pages(start_pfn, nr_pages);
+                break;
+        default:
+                WARN(1, KERN_WARNING "%s(%ld, %ld) unknown action: "
+                     "%ld\n", __func__, phys_index, action, action);
+                ret = -EINVAL;
         }
 
         return ret;
diff --git a/drivers/base/node.c b/drivers/base/node.c
index 36fabe43cd44..a2aa65b4215d 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -180,7 +180,7 @@ static ssize_t node_read_vmstat(struct device *dev,
 static DEVICE_ATTR(vmstat, S_IRUGO, node_read_vmstat, NULL);
 
 static ssize_t node_read_distance(struct device *dev,
-                        struct device_attribute *attr, char * buf)
+                        struct device_attribute *attr, char *buf)
 {
         int nid = dev->id;
         int len = 0;
@@ -200,6 +200,17 @@ static ssize_t node_read_distance(struct device *dev,
 }
 static DEVICE_ATTR(distance, S_IRUGO, node_read_distance, NULL);
 
+static struct attribute *node_dev_attrs[] = {
+        &dev_attr_cpumap.attr,
+        &dev_attr_cpulist.attr,
+        &dev_attr_meminfo.attr,
+        &dev_attr_numastat.attr,
+        &dev_attr_distance.attr,
+        &dev_attr_vmstat.attr,
+        NULL
+};
+ATTRIBUTE_GROUPS(node_dev);
+
 #ifdef CONFIG_HUGETLBFS
 /*
  * hugetlbfs per node attributes registration interface:
@@ -273,16 +284,10 @@ static int register_node(struct node *node, int num, struct node *parent)
         node->dev.id = num;
         node->dev.bus = &node_subsys;
         node->dev.release = node_device_release;
+        node->dev.groups = node_dev_groups;
         error = device_register(&node->dev);
 
         if (!error){
-                device_create_file(&node->dev, &dev_attr_cpumap);
-                device_create_file(&node->dev, &dev_attr_cpulist);
-                device_create_file(&node->dev, &dev_attr_meminfo);
-                device_create_file(&node->dev, &dev_attr_numastat);
-                device_create_file(&node->dev, &dev_attr_distance);
-                device_create_file(&node->dev, &dev_attr_vmstat);
-
                 hugetlb_register_node(node);
 
                 compaction_register_node(node);
@@ -299,13 +304,6 @@ static int register_node(struct node *node, int num, struct node *parent)
  */
 void unregister_node(struct node *node)
 {
-        device_remove_file(&node->dev, &dev_attr_cpumap);
-        device_remove_file(&node->dev, &dev_attr_cpulist);
-        device_remove_file(&node->dev, &dev_attr_meminfo);
-        device_remove_file(&node->dev, &dev_attr_numastat);
-        device_remove_file(&node->dev, &dev_attr_distance);
-        device_remove_file(&node->dev, &dev_attr_vmstat);
-
         hugetlb_unregister_node(node);          /* no-op, if memoryless node */
 
         device_unregister(&node->dev);
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 9421fed40905..e68ab79df28b 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -101,6 +101,15 @@ int platform_get_irq(struct platform_device *dev, unsigned int num)
         }
 
         r = platform_get_resource(dev, IORESOURCE_IRQ, num);
+        /*
+         * The resources may pass trigger flags to the irqs that need
+         * to be set up. It so happens that the trigger flags for
+         * IORESOURCE_BITS correspond 1-to-1 to the IRQF_TRIGGER*
+         * settings.
+         */
+        if (r && r->flags & IORESOURCE_BITS)
+                irqd_set_trigger_type(irq_get_irq_data(r->start),
+                                      r->flags & IORESOURCE_BITS);
 
         return r ? r->start : -ENXIO;
 #endif
diff --git a/drivers/base/property.c b/drivers/base/property.c
index c45845874d4f..423df593f262 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -365,7 +365,7 @@ int fwnode_property_read_string(struct fwnode_handle *fwnode,
                                 const char *propname, const char **val)
 {
         if (is_of_node(fwnode))
-                return of_property_read_string(of_node(fwnode),propname, val);
+                return of_property_read_string(of_node(fwnode), propname, val);
         else if (is_acpi_node(fwnode))
                 return acpi_dev_prop_read(acpi_node(fwnode), propname,
                                           DEV_PROP_STRING, val, 1);
diff --git a/drivers/base/soc.c b/drivers/base/soc.c
index 72b5e7280d14..39fca01c8fa1 100644
--- a/drivers/base/soc.c
+++ b/drivers/base/soc.c
@@ -43,8 +43,8 @@ struct device *soc_device_to_device(struct soc_device *soc_dev)
 }
 
 static umode_t soc_attribute_mode(struct kobject *kobj,
-                                 struct attribute *attr,
-                                 int index)
+                                struct attribute *attr,
+                                int index)
 {
         struct device *dev = container_of(kobj, struct device, kobj);
         struct soc_device *soc_dev = container_of(dev, struct soc_device, dev);
@@ -60,7 +60,7 @@ static umode_t soc_attribute_mode(struct kobject *kobj,
                 return attr->mode;
         if ((attr == &dev_attr_soc_id.attr)
             && (soc_dev->attr->soc_id != NULL))
-                return attr->mode;
+                return attr->mode;
 
         /* Unknown or unfilled attribute. */
         return 0;
@@ -117,7 +117,7 @@ struct soc_device *soc_device_register(struct soc_device_attribute *soc_dev_attr
 
         soc_dev = kzalloc(sizeof(*soc_dev), GFP_KERNEL);
         if (!soc_dev) {
-                ret = -ENOMEM;
+                ret = -ENOMEM;
                 goto out1;
         }
 
@@ -135,7 +135,7 @@ struct soc_device *soc_device_register(struct soc_device_attribute *soc_dev_attr
         } while (ret == -EAGAIN);
 
         if (ret)
-                 goto out2;
+                goto out2;
 
         soc_dev->attr = soc_dev_attr;
         soc_dev->dev.bus = &soc_bus_type;