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

Pull char/misc driver updates from Greg KH:
 "Here is the big char/misc driver patchset for 4.11-rc1.

  Lots of different driver subsystems updated here: rework for the
  hyperv subsystem to handle new platforms better, mei and w1 and extcon
  driver updates, as well as a number of other "minor" driver updates.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'char-misc-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (169 commits)
  goldfish: Sanitize the broken interrupt handler
  x86/platform/goldfish: Prevent unconditional loading
  vmbus: replace modulus operation with subtraction
  vmbus: constify parameters where possible
  vmbus: expose hv_begin/end_read
  vmbus: remove conditional locking of vmbus_write
  vmbus: add direct isr callback mode
  vmbus: change to per channel tasklet
  vmbus: put related per-cpu variable together
  vmbus: callback is in softirq not workqueue
  binder: Add support for file-descriptor arrays
  binder: Add support for scatter-gather
  binder: Add extra size to allocator
  binder: Refactor binder_transact()
  binder: Support multiple /dev instances
  binder: Deal with contexts in debugfs
  binder: Support multiple context managers
  binder: Split flat_binder_object
  auxdisplay: ht16k33: remove private workqueue
  auxdisplay: ht16k33: rework input device initialization
  ...

1 files changed, 15 insertions, 28 deletions

diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c
index 7c1e3a7b14e0..09ac5e70c2f3 100644
--- a/drivers/extcon/extcon.c
+++ b/drivers/extcon/extcon.c
@@ -30,11 +30,12 @@
 #include <linux/device.h>
 #include <linux/fs.h>
 #include <linux/err.h>
-#include <linux/extcon.h>
 #include <linux/of.h>
 #include <linux/slab.h>
 #include <linux/sysfs.h>
 
+#include "extcon.h"
+
 #define SUPPORTED_CABLE_MAX     32
 #define CABLE_NAME_MAX          30
 
@@ -59,7 +60,7 @@ struct __extcon_info {
         [EXTCON_USB_HOST] = {
                 .type = EXTCON_TYPE_USB,
                 .id = EXTCON_USB_HOST,
-                .name = "USB_HOST",
+                .name = "USB-HOST",
         },
 
         /* Charging external connector */
@@ -98,6 +99,11 @@ struct __extcon_info {
                 .id = EXTCON_CHG_WPT,
                 .name = "WPT",
         },
+        [EXTCON_CHG_USB_PD] = {
+                .type = EXTCON_TYPE_CHG | EXTCON_TYPE_USB,
+                .id = EXTCON_CHG_USB_PD,
+                .name = "PD",
+        },
 
         /* Jack external connector */
         [EXTCON_JACK_MICROPHONE] = {
@@ -906,35 +912,16 @@ int extcon_register_notifier(struct extcon_dev *edev, unsigned int id,
         unsigned long flags;
         int ret, idx = -EINVAL;
 
-        if (!nb)
+        if (!edev || !nb)
                 return -EINVAL;
 
-        if (edev) {
-                idx = find_cable_index_by_id(edev, id);
-                if (idx < 0)
-                        return idx;
-
-                spin_lock_irqsave(&edev->lock, flags);
-                ret = raw_notifier_chain_register(&edev->nh[idx], nb);
-                spin_unlock_irqrestore(&edev->lock, flags);
-        } else {
-                struct extcon_dev *extd;
-
-                mutex_lock(&extcon_dev_list_lock);
-                list_for_each_entry(extd, &extcon_dev_list, entry) {
-                        idx = find_cable_index_by_id(extd, id);
-                        if (idx >= 0)
-                                break;
-                }
-                mutex_unlock(&extcon_dev_list_lock);
+        idx = find_cable_index_by_id(edev, id);
+        if (idx < 0)
+                return idx;
 
-                if (idx >= 0) {
-                        edev = extd;
-                        return extcon_register_notifier(extd, id, nb);
-                } else {
-                        ret = -ENODEV;
-                }
-        }
+        spin_lock_irqsave(&edev->lock, flags);
+        ret = raw_notifier_chain_register(&edev->nh[idx], nb);
+        spin_unlock_irqrestore(&edev->lock, flags);
 
         return ret;
 }