1 files changed, 37 insertions, 35 deletions

diff --git a/include/linux/extcon.h b/include/linux/extcon.h
index fcb51c88319f..21c59af1150b 100644
--- a/include/linux/extcon.h
+++ b/include/linux/extcon.h
@@ -51,10 +51,10 @@
 enum extcon_cable_name {
         EXTCON_USB = 0,
         EXTCON_USB_HOST,
-        EXTCON_TA, /* Travel Adaptor */
+        EXTCON_TA,                      /* Travel Adaptor */
         EXTCON_FAST_CHARGER,
         EXTCON_SLOW_CHARGER,
-        EXTCON_CHARGE_DOWNSTREAM, /* Charging an external device */
+        EXTCON_CHARGE_DOWNSTREAM,       /* Charging an external device */
         EXTCON_HDMI,
         EXTCON_MHL,
         EXTCON_DVI,
@@ -76,8 +76,8 @@ struct extcon_cable;
 
 /**
  * struct extcon_dev - An extcon device represents one external connector.
- * @name:       The name of this extcon device. Parent device name is used
- *              if NULL.
+ * @name:               The name of this extcon device. Parent device name is
+ *                      used if NULL.
  * @supported_cable:    Array of supported cable names ending with NULL.
  *                      If supported_cable is NULL, cable name related APIs
  *                      are disabled.
@@ -89,21 +89,21 @@ struct extcon_cable;
  *                      be attached simulataneously. {0x7, 0} is equivalent to
  *                      {0x3, 0x6, 0x5, 0}. If it is {0xFFFFFFFF, 0}, there
  *                      can be no simultaneous connections.
- * @print_name: An optional callback to override the method to print the
- *              name of the extcon device.
+ * @print_name:         An optional callback to override the method to print the
+ *                      name of the extcon device.
  * @print_state:        An optional callback to override the method to print the
- *              status of the extcon device.
- * @dev:        Device of this extcon. Do not provide at register-time.
- * @state:      Attach/detach state of this extcon. Do not provide at
- *              register-time
- * @nh: Notifier for the state change events from this extcon
- * @entry:      To support list of extcon devices so that users can search
- *              for extcon devices based on the extcon name.
+ *                      status of the extcon device.
+ * @dev:                Device of this extcon.
+ * @state:              Attach/detach state of this extcon. Do not provide at
+ *                      register-time.
+ * @nh:                 Notifier for the state change events from this extcon
+ * @entry:              To support list of extcon devices so that users can search
+ *                      for extcon devices based on the extcon name.
  * @lock:
  * @max_supported:      Internal value to store the number of cables.
  * @extcon_dev_type:    Device_type struct to provide attribute_groups
  *                      customized for each extcon device.
- * @cables:     Sysfs subdirectories. Each represents one cable.
+ * @cables:             Sysfs subdirectories. Each represents one cable.
  *
  * In most cases, users only need to provide "User initializing data" of
  * this struct when registering an extcon. In some exceptional cases,
@@ -111,26 +111,27 @@ struct extcon_cable;
  * are overwritten by register function.
  */
 struct extcon_dev {
-        /* --- Optional user initializing data --- */
-        const char      *name;
+        /* Optional user initializing data */
+        const char *name;
         const char **supported_cable;
-        const u32       *mutually_exclusive;
+        const u32 *mutually_exclusive;
 
-        /* --- Optional callbacks to override class functions --- */
+        /* Optional callbacks to override class functions */
         ssize_t (*print_name)(struct extcon_dev *edev, char *buf);
         ssize_t (*print_state)(struct extcon_dev *edev, char *buf);
 
-        /* --- Internal data. Please do not set. --- */
-        struct device   *dev;
-        u32             state;
+        /* Internal data. Please do not set. */
+        struct device dev;
         struct raw_notifier_head nh;
         struct list_head entry;
-        spinlock_t lock; /* could be called by irq handler */
         int max_supported;
+        spinlock_t lock;        /* could be called by irq handler */
+        u32 state;
 
         /* /sys/class/extcon/.../cable.n/... */
         struct device_type extcon_dev_type;
         struct extcon_cable *cables;
+
         /* /sys/class/extcon/.../mutually_exclusive/... */
         struct attribute_group attr_g_muex;
         struct attribute **attrs_muex;
@@ -138,13 +139,13 @@ struct extcon_dev {
 };
 
 /**
- * struct extcon_cable  - An internal data for each cable of extcon device.
- * @edev:       The extcon device
+ * struct extcon_cable - An internal data for each cable of extcon device.
+ * @edev:               The extcon device
  * @cable_index:        Index of this cable in the edev
- * @attr_g:     Attribute group for the cable
- * @attr_name:  "name" sysfs entry
- * @attr_state: "state" sysfs entry
- * @attrs:      Array pointing to attr_name and attr_state for attr_g
+ * @attr_g:             Attribute group for the cable
+ * @attr_name:          "name" sysfs entry
+ * @attr_state:         "state" sysfs entry
+ * @attrs:              Array pointing to attr_name and attr_state for attr_g
  */
 struct extcon_cable {
         struct extcon_dev *edev;
@@ -159,11 +160,13 @@ struct extcon_cable {
 
 /**
  * struct extcon_specific_cable_nb - An internal data for
- *                              extcon_register_interest().
- * @internal_nb:        a notifier block bridging extcon notifier and cable notifier.
- * @user_nb:    user provided notifier block for events from a specific cable.
+ *                                   extcon_register_interest().
+ * @internal_nb:        A notifier block bridging extcon notifier
+ *                      and cable notifier.
+ * @user_nb:            user provided notifier block for events from
+ *                      a specific cable.
  * @cable_index:        the target cable.
- * @edev:       the target extcon device.
+ * @edev:               the target extcon device.
  * @previous_value:     the saved previous event value.
  */
 struct extcon_specific_cable_nb {
@@ -180,7 +183,7 @@ struct extcon_specific_cable_nb {
  * Following APIs are for notifiers or configurations.
  * Notifiers are the external port and connection devices.
  */
-extern int extcon_dev_register(struct extcon_dev *edev, struct device *dev);
+extern int extcon_dev_register(struct extcon_dev *edev);
 extern void extcon_dev_unregister(struct extcon_dev *edev);
 extern struct extcon_dev *extcon_get_extcon_dev(const char *extcon_name);
 
@@ -238,8 +241,7 @@ extern int extcon_register_notifier(struct extcon_dev *edev,
 extern int extcon_unregister_notifier(struct extcon_dev *edev,
                                       struct notifier_block *nb);
 #else /* CONFIG_EXTCON */
-static inline int extcon_dev_register(struct extcon_dev *edev,
-                                      struct device *dev)
+static inline int extcon_dev_register(struct extcon_dev *edev)
 {
         return 0;
 }