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

Pull char/misc driver updates from Greg KH:
 "Here's the big char/misc driver patchset for 4.1-rc1.

  Lots of different driver subsystem updates here, nothing major, full
  details are in the shortlog.

  All of this has been in linux-next for a while"

* tag 'char-misc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (133 commits)
  mei: trace: remove unused TRACE_SYSTEM_STRING
  DTS: ARM: OMAP3-N900: Add lis3lv02d support
  Documentation: DT: lis302: update wakeup binding
  lis3lv02d: DT: add wakeup unit 2 and wakeup threshold
  lis3lv02d: DT: use s32 to support negative values
  Drivers: hv: hv_balloon: correctly handle num_pages>INT_MAX case
  Drivers: hv: hv_balloon: correctly handle val.freeram<num_pages case
  mei: replace check for connection instead of transitioning
  mei: use mei_cl_is_connected consistently
  mei: fix mei_poll operation
  hv_vmbus: Add gradually increased delay for retries in vmbus_post_msg()
  Drivers: hv: hv_balloon: survive ballooning request with num_pages=0
  Drivers: hv: hv_balloon: eliminate jumps in piecewiese linear floor function
  Drivers: hv: hv_balloon: do not online pages in offline blocks
  hv: remove the per-channel workqueue
  hv: don't schedule new works in vmbus_onoffer()/vmbus_onoffer_rescind()
  hv: run non-blocking message handlers in the dispatch tasklet
  coresight: moving to new "hwtracing" directory
  coresight-tmc: Adding a status interface to sysfs
  coresight: remove the unnecessary configuration coresight-default-sink
  ...

10 files changed, 43 insertions, 43 deletions

diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index 571ef61f8ea9..da8faf78536a 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -300,11 +300,14 @@ static const struct file_operations rng_chrdev_ops = {
         .llseek         = noop_llseek,
 };
 
+static const struct attribute_group *rng_dev_groups[];
+
 static struct miscdevice rng_miscdev = {
         .minor          = RNG_MISCDEV_MINOR,
         .name           = RNG_MODULE_NAME,
         .nodename       = "hwrng",
         .fops           = &rng_chrdev_ops,
+        .groups         = rng_dev_groups,
 };
 
 
@@ -377,37 +380,22 @@ static DEVICE_ATTR(rng_available, S_IRUGO,
                    hwrng_attr_available_show,
                    NULL);
 
+static struct attribute *rng_dev_attrs[] = {
+        &dev_attr_rng_current.attr,
+        &dev_attr_rng_available.attr,
+        NULL
+};
+
+ATTRIBUTE_GROUPS(rng_dev);
 
 static void __exit unregister_miscdev(void)
 {
-        device_remove_file(rng_miscdev.this_device, &dev_attr_rng_available);
-        device_remove_file(rng_miscdev.this_device, &dev_attr_rng_current);
         misc_deregister(&rng_miscdev);
 }
 
 static int __init register_miscdev(void)
 {
-        int err;
-
-        err = misc_register(&rng_miscdev);
-        if (err)
-                goto out;
-        err = device_create_file(rng_miscdev.this_device,
-                                 &dev_attr_rng_current);
-        if (err)
-                goto err_misc_dereg;
-        err = device_create_file(rng_miscdev.this_device,
-                                 &dev_attr_rng_available);
-        if (err)
-                goto err_remove_current;
-out:
-        return err;
-
-err_remove_current:
-        device_remove_file(rng_miscdev.this_device, &dev_attr_rng_current);
-err_misc_dereg:
-        misc_deregister(&rng_miscdev);
-        goto out;
+        return misc_register(&rng_miscdev);
 }
 
 static int hwrng_fillfn(void *unused)
diff --git a/drivers/char/hw_random/pasemi-rng.c b/drivers/char/hw_random/pasemi-rng.c
index 3eb7bdd7f93b..51cb1d5cc489 100644
--- a/drivers/char/hw_random/pasemi-rng.c
+++ b/drivers/char/hw_random/pasemi-rng.c
@@ -133,7 +133,7 @@ static int rng_remove(struct platform_device *dev)
         return 0;
 }
 
-static struct of_device_id rng_match[] = {
+static const struct of_device_id rng_match[] = {
         { .compatible      = "1682m-rng", },
         { .compatible      = "pasemi,pwrficient-rng", },
         { },
diff --git a/drivers/char/hw_random/powernv-rng.c b/drivers/char/hw_random/powernv-rng.c
index 3f4f63204560..263a5bb8e605 100644
--- a/drivers/char/hw_random/powernv-rng.c
+++ b/drivers/char/hw_random/powernv-rng.c
@@ -61,7 +61,7 @@ static int powernv_rng_probe(struct platform_device *pdev)
         return 0;
 }
 
-static struct of_device_id powernv_rng_match[] = {
+static const struct of_device_id powernv_rng_match[] = {
         { .compatible   = "ibm,power-rng",},
         {},
 };
diff --git a/drivers/char/hw_random/ppc4xx-rng.c b/drivers/char/hw_random/ppc4xx-rng.c
index c85d31a5f9e3..b2cfda0fa93e 100644
--- a/drivers/char/hw_random/ppc4xx-rng.c
+++ b/drivers/char/hw_random/ppc4xx-rng.c
@@ -123,7 +123,7 @@ static int ppc4xx_rng_remove(struct platform_device *dev)
         return 0;
 }
 
-static struct of_device_id ppc4xx_rng_match[] = {
+static const struct of_device_id ppc4xx_rng_match[] = {
         { .compatible = "ppc4xx-rng", },
         { .compatible = "amcc,ppc460ex-rng", },
         { .compatible = "amcc,ppc440epx-rng", },
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index 24cc4ed9a780..a43048b5b05f 100644
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -510,13 +510,15 @@ static int i8k_proc_show(struct seq_file *seq, void *offset)
          * 9)  AC power
          * 10) Fn Key status
          */
-        return seq_printf(seq, "%s %s %s %d %d %d %d %d %d %d\n",
-                          I8K_PROC_FMT,
-                          bios_version,
-                          i8k_get_dmi_data(DMI_PRODUCT_SERIAL),
-                          cpu_temp,
-                          left_fan, right_fan, left_speed, right_speed,
-                          ac_power, fn_key);
+        seq_printf(seq, "%s %s %s %d %d %d %d %d %d %d\n",
+                   I8K_PROC_FMT,
+                   bios_version,
+                   i8k_get_dmi_data(DMI_PRODUCT_SERIAL),
+                   cpu_temp,
+                   left_fan, right_fan, left_speed, right_speed,
+                   ac_power, fn_key);
+
+        return 0;
 }
 
 static int i8k_open_fs(struct inode *inode, struct file *file)
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 518585c1ce94..5e90a18afbaf 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2667,7 +2667,7 @@ static struct pci_driver ipmi_pci_driver = {
 };
 #endif /* CONFIG_PCI */
 
-static struct of_device_id ipmi_match[];
+static const struct of_device_id ipmi_match[];
 static int ipmi_probe(struct platform_device *dev)
 {
 #ifdef CONFIG_OF
@@ -2764,7 +2764,7 @@ static int ipmi_remove(struct platform_device *dev)
         return 0;
 }
 
-static struct of_device_id ipmi_match[] =
+static const struct of_device_id ipmi_match[] =
 {
         { .type = "ipmi", .compatible = "ipmi-kcs",
           .data = (void *)(unsigned long) SI_KCS },
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index ffa97d261cf3..9fd5a91e0d81 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -140,12 +140,17 @@ static int misc_open(struct inode * inode, struct file * file)
                         goto fail;
         }
 
+        /*
+         * Place the miscdevice in the file's
+         * private_data so it can be used by the
+         * file operations, including f_op->open below
+         */
+        file->private_data = c;
+
         err = 0;
         replace_fops(file, new_fops);
-        if (file->f_op->open) {
-                file->private_data = c;
+        if (file->f_op->open)
                 err = file->f_op->open(inode,file);
-        }
 fail:
         mutex_unlock(&misc_mtx);
         return err;
@@ -169,7 +174,9 @@ static const struct file_operations misc_fops = {
  *      the minor number requested is used.
  *
  *      The structure passed is linked into the kernel and may not be
- *      destroyed until it has been unregistered.
+ *      destroyed until it has been unregistered. By default, an open()
+ *      syscall to the device sets file->private_data to point to the
+ *      structure. Drivers don't need open in fops for this.
  *
  *      A zero is returned on success and a negative errno code for
  *      failure.
@@ -205,8 +212,9 @@ int misc_register(struct miscdevice * misc)
 
         dev = MKDEV(MISC_MAJOR, misc->minor);
 
-        misc->this_device = device_create(misc_class, misc->parent, dev,
-                                          misc, "%s", misc->name);
+        misc->this_device =
+                device_create_with_groups(misc_class, misc->parent, dev,
+                                          misc, misc->groups, "%s", misc->name);
         if (IS_ERR(misc->this_device)) {
                 int i = DYNAMIC_MINORS - misc->minor - 1;
                 if (i < DYNAMIC_MINORS && i >= 0)
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 72d7028f779b..50754d203310 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -355,7 +355,7 @@ static inline bool use_multiport(struct ports_device *portdev)
          * early_init
          */
         if (!portdev->vdev)
-                return 0;
+                return false;
         return __virtio_test_bit(portdev->vdev, VIRTIO_CONSOLE_F_MULTIPORT);
 }
 
diff --git a/drivers/char/xillybus/xillybus_core.c b/drivers/char/xillybus/xillybus_core.c
index b827fa095f1b..77d6c127e691 100644
--- a/drivers/char/xillybus/xillybus_core.c
+++ b/drivers/char/xillybus/xillybus_core.c
@@ -1237,6 +1237,8 @@ static ssize_t xillybus_write(struct file *filp, const char __user *userbuf,
                                         unsigned char *tail;
                                         int i;
 
+                                        howmany = 0;
+
                                         end_offset_plus1 = bufpos >>
                                                 channel->log2_element_size;
 
diff --git a/drivers/char/xillybus/xillybus_of.c b/drivers/char/xillybus/xillybus_of.c
index 2002a3a28146..781865084dc1 100644
--- a/drivers/char/xillybus/xillybus_of.c
+++ b/drivers/char/xillybus/xillybus_of.c
@@ -31,7 +31,7 @@ MODULE_LICENSE("GPL v2");
 static const char xillyname[] = "xillybus_of";
 
 /* Match table for of_platform binding */
-static struct of_device_id xillybus_of_match[] = {
+static const struct of_device_id xillybus_of_match[] = {
         { .compatible = "xillybus,xillybus-1.00.a", },
         { .compatible = "xlnx,xillybus-1.00.a", }, /* Deprecated */
         {}