浏览代码

extcon: Fix the checkpatch warning and minor coding style issue

This patch clean up the extcon core driver by fixing the checkpatch warning
and minor coding style issue.

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Chanwoo Choi 10 年之前
父节点
当前提交
b9ec23c08a
共有 2 个文件被更改,包括 9 次插入8 次删除
  1. 5 5
      drivers/extcon/extcon.c
  2. 4 3
      include/linux/extcon.h

+ 5 - 5
drivers/extcon/extcon.c

@@ -1,5 +1,5 @@
 /*
 /*
- *  drivers/extcon/extcon_class.c
+ *  drivers/extcon/extcon.c - External Connector (extcon) framework.
  *
  *
  *  External connector (extcon) class driver
  *  External connector (extcon) class driver
  *
  *
@@ -19,8 +19,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  * GNU General Public License for more details.
- *
-*/
+ */
 
 
 #include <linux/module.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/types.h>
@@ -469,7 +468,6 @@ int extcon_register_interest(struct extcon_specific_cable_nb *obj,
 		ret = raw_notifier_chain_register(&obj->edev->nh,
 		ret = raw_notifier_chain_register(&obj->edev->nh,
 						  &obj->internal_nb);
 						  &obj->internal_nb);
 		spin_unlock_irqrestore(&obj->edev->lock, flags);
 		spin_unlock_irqrestore(&obj->edev->lock, flags);
-		return ret;
 	} else {
 	} else {
 		struct class_dev_iter iter;
 		struct class_dev_iter iter;
 		struct extcon_dev *extd;
 		struct extcon_dev *extd;
@@ -489,8 +487,10 @@ int extcon_register_interest(struct extcon_specific_cable_nb *obj,
 						cable_name, nb);
 						cable_name, nb);
 		}
 		}
 
 
-		return -ENODEV;
+		ret = -ENODEV;
 	}
 	}
+
+	return ret;
 }
 }
 EXPORT_SYMBOL_GPL(extcon_register_interest);
 EXPORT_SYMBOL_GPL(extcon_register_interest);
 
 

+ 4 - 3
include/linux/extcon.h

@@ -97,8 +97,8 @@ struct extcon_cable;
  * @state:		Attach/detach state of this extcon. Do not provide at
  * @state:		Attach/detach state of this extcon. Do not provide at
  *			register-time.
  *			register-time.
  * @nh:			Notifier for the state change events from this extcon
  * @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.
+ * @entry:		To support list of extcon devices so that users can
+ *			search for extcon devices based on the extcon name.
  * @lock:
  * @lock:
  * @max_supported:	Internal value to store the number of cables.
  * @max_supported:	Internal value to store the number of cables.
  * @extcon_dev_type:	Device_type struct to provide attribute_groups
  * @extcon_dev_type:	Device_type struct to provide attribute_groups
@@ -258,7 +258,8 @@ extern int extcon_unregister_notifier(struct extcon_dev *edev,
  * Following API get the extcon device from devicetree.
  * Following API get the extcon device from devicetree.
  * This function use phandle of devicetree to get extcon device directly.
  * This function use phandle of devicetree to get extcon device directly.
  */
  */
-extern struct extcon_dev *extcon_get_edev_by_phandle(struct device *dev, int index);
+extern struct extcon_dev *extcon_get_edev_by_phandle(struct device *dev,
+						     int index);
 
 
 /* Following API to get information of extcon device */
 /* Following API to get information of extcon device */
 extern const char *extcon_get_edev_name(struct extcon_dev *edev);
 extern const char *extcon_get_edev_name(struct extcon_dev *edev);