5 files changed, 56 insertions, 61 deletions

diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index f10f05d4ee9c..414aed50b1bc 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -166,6 +166,7 @@ static irqreturn_t arizona_micdet(int irq, void *data)
         ret = regmap_read(arizona->regmap, ARIZONA_MIC_DETECT_3, &val);
         if (ret != 0) {
                 dev_err(arizona->dev, "Failed to read MICDET: %d\n", ret);
+                mutex_unlock(&info->lock);
                 return IRQ_NONE;
         }
 
diff --git a/drivers/extcon/extcon-class.c b/drivers/extcon/extcon-class.c
index d398821097f3..60adc04b0561 100644
--- a/drivers/extcon/extcon-class.c
+++ b/drivers/extcon/extcon-class.c
@@ -472,7 +472,7 @@ int extcon_register_interest(struct extcon_specific_cable_nb *obj,
 
                 obj->cable_index = extcon_find_cable_index(obj->edev, cable_name);
                 if (obj->cable_index < 0)
-                        return -ENODEV;
+                        return obj->cable_index;
 
                 obj->user_nb = nb;
 
diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c
index b656dfa401a6..8c17b65eb74d 100644
--- a/drivers/extcon/extcon-max77693.c
+++ b/drivers/extcon/extcon-max77693.c
@@ -657,17 +657,17 @@ static int max77693_muic_probe(struct platform_device *pdev)
         int ret, i;
         u8 id;
 
-        info = kzalloc(sizeof(struct max77693_muic_info), GFP_KERNEL);
+        info = devm_kzalloc(&pdev->dev, sizeof(struct max77693_muic_info),
+                                   GFP_KERNEL);
         if (!info) {
                 dev_err(&pdev->dev, "failed to allocate memory\n");
-                ret = -ENOMEM;
-                goto err_kfree;
+                return -ENOMEM;
         }
         info->dev = &pdev->dev;
         info->max77693 = max77693;
-        if (info->max77693->regmap_muic)
+        if (info->max77693->regmap_muic) {
                 dev_dbg(&pdev->dev, "allocate register map\n");
-        else {
+        } else {
                 info->max77693->regmap_muic = devm_regmap_init_i2c(
                                                 info->max77693->muic,
                                                 &max77693_muic_regmap_config);
@@ -675,7 +675,7 @@ static int max77693_muic_probe(struct platform_device *pdev)
                         ret = PTR_ERR(info->max77693->regmap_muic);
                         dev_err(max77693->dev,
                                 "failed to allocate register map: %d\n", ret);
-                        goto err_regmap;
+                        return ret;
                 }
         }
         platform_set_drvdata(pdev, info);
@@ -686,11 +686,13 @@ static int max77693_muic_probe(struct platform_device *pdev)
         /* Support irq domain for MAX77693 MUIC device */
         for (i = 0; i < ARRAY_SIZE(muic_irqs); i++) {
                 struct max77693_muic_irq *muic_irq = &muic_irqs[i];
-                int virq = 0;
+                unsigned int virq = 0;
 
                 virq = irq_create_mapping(max77693->irq_domain, muic_irq->irq);
-                if (!virq)
+                if (!virq) {
+                        ret = -EINVAL;
                         goto err_irq;
+                }
                 muic_irq->virq = virq;
 
                 ret = request_threaded_irq(virq, NULL,
@@ -702,14 +704,13 @@ static int max77693_muic_probe(struct platform_device *pdev)
                                 " error :%d)\n",
                                 muic_irq->irq, ret);
 
-                        for (i = i - 1; i >= 0; i--)
-                                free_irq(muic_irq->virq, info);
                         goto err_irq;
                 }
         }
 
         /* Initialize extcon device */
-        info->edev = kzalloc(sizeof(struct extcon_dev), GFP_KERNEL);
+        info->edev = devm_kzalloc(&pdev->dev, sizeof(struct extcon_dev),
+                                  GFP_KERNEL);
         if (!info->edev) {
                 dev_err(&pdev->dev, "failed to allocate memory for extcon\n");
                 ret = -ENOMEM;
@@ -720,7 +721,7 @@ static int max77693_muic_probe(struct platform_device *pdev)
         ret = extcon_dev_register(info->edev, NULL);
         if (ret) {
                 dev_err(&pdev->dev, "failed to register extcon device\n");
-                goto err_extcon;
+                goto err_irq;
         }
 
         /* Initialize MUIC register by using platform data */
@@ -753,7 +754,7 @@ static int max77693_muic_probe(struct platform_device *pdev)
                         MAX77693_MUIC_REG_ID, &id);
         if (ret < 0) {
                 dev_err(&pdev->dev, "failed to read revision number\n");
-                goto err_extcon;
+                goto err_irq;
         }
         dev_info(info->dev, "device ID : 0x%x\n", id);
 
@@ -765,12 +766,9 @@ static int max77693_muic_probe(struct platform_device *pdev)
 
         return ret;
 
-err_extcon:
-        kfree(info->edev);
 err_irq:
-err_regmap:
-        kfree(info);
-err_kfree:
+        while (--i >= 0)
+                free_irq(muic_irqs[i].virq, info);
         return ret;
 }
 
@@ -783,8 +781,6 @@ static int max77693_muic_remove(struct platform_device *pdev)
                 free_irq(muic_irqs[i].virq, info);
         cancel_work_sync(&info->irq_work);
         extcon_dev_unregister(info->edev);
-        kfree(info->edev);
-        kfree(info);
 
         return 0;
 }
diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
index bad76f51161b..93009fe6ef05 100644
--- a/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@ -1,7 +1,7 @@
 /*
  * extcon-max8997.c - MAX8997 extcon driver to support MAX8997 MUIC
  *
- *  Copyright (C) 2012 Samsung Electrnoics
+ *  Copyright (C) 2012 Samsung Electronics
  *  Donggeun Kim <dg77.kim@samsung.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -433,11 +433,11 @@ static int max8997_muic_probe(struct platform_device *pdev)
         struct max8997_muic_info *info;
         int ret, i;
 
-        info = kzalloc(sizeof(struct max8997_muic_info), GFP_KERNEL);
+        info = devm_kzalloc(&pdev->dev, sizeof(struct max8997_muic_info),
+                            GFP_KERNEL);
         if (!info) {
                 dev_err(&pdev->dev, "failed to allocate memory\n");
-                ret = -ENOMEM;
-                goto err_kfree;
+                return -ENOMEM;
         }
 
         info->dev = &pdev->dev;
@@ -450,14 +450,16 @@ static int max8997_muic_probe(struct platform_device *pdev)
 
         for (i = 0; i < ARRAY_SIZE(muic_irqs); i++) {
                 struct max8997_muic_irq *muic_irq = &muic_irqs[i];
-                int virq = 0;
+                unsigned int virq = 0;
 
                 virq = irq_create_mapping(max8997->irq_domain, muic_irq->irq);
-                if (!virq)
+                if (!virq) {
+                        ret = -EINVAL;
                         goto err_irq;
+                }
                 muic_irq->virq = virq;
 
-                ret = request_threaded_irq(virq, NULL,max8997_muic_irq_handler,
+                ret = request_threaded_irq(virq, NULL, max8997_muic_irq_handler,
                                 0, muic_irq->name, info);
                 if (ret) {
                         dev_err(&pdev->dev,
@@ -469,7 +471,8 @@ static int max8997_muic_probe(struct platform_device *pdev)
         }
 
         /* External connector */
-        info->edev = kzalloc(sizeof(struct extcon_dev), GFP_KERNEL);
+        info->edev = devm_kzalloc(&pdev->dev, sizeof(struct extcon_dev),
+                                  GFP_KERNEL);
         if (!info->edev) {
                 dev_err(&pdev->dev, "failed to allocate memory for extcon\n");
                 ret = -ENOMEM;
@@ -480,7 +483,7 @@ static int max8997_muic_probe(struct platform_device *pdev)
         ret = extcon_dev_register(info->edev, NULL);
         if (ret) {
                 dev_err(&pdev->dev, "failed to register extcon device\n");
-                goto err_extcon;
+                goto err_irq;
         }
 
         /* Initialize registers according to platform data */
@@ -498,13 +501,9 @@ static int max8997_muic_probe(struct platform_device *pdev)
 
         return ret;
 
-err_extcon:
-        kfree(info->edev);
 err_irq:
         while (--i >= 0)
                 free_irq(muic_irqs[i].virq, info);
-        kfree(info);
-err_kfree:
         return ret;
 }
 
@@ -519,9 +518,6 @@ static int max8997_muic_remove(struct platform_device *pdev)
 
         extcon_dev_unregister(info->edev);
 
-        kfree(info->edev);
-        kfree(info);
-
         return 0;
 }
 
diff --git a/include/linux/extcon.h b/include/linux/extcon.h
index 2c26c14cd710..fcb51c88319f 100644
--- a/include/linux/extcon.h
+++ b/include/linux/extcon.h
@@ -23,7 +23,9 @@
 #ifndef __LINUX_EXTCON_H__
 #define __LINUX_EXTCON_H__
 
+#include <linux/device.h>
 #include <linux/notifier.h>
+#include <linux/sysfs.h>
 
 #define SUPPORTED_CABLE_MAX     32
 #define CABLE_NAME_MAX          30
@@ -74,12 +76,12 @@ 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
+ * @name:       The name of this extcon device. Parent device name is used
  *              if NULL.
- * @supported_cable     Array of supported cable names ending with NULL.
+ * @supported_cable:    Array of supported cable names ending with NULL.
  *                      If supported_cable is NULL, cable name related APIs
  *                      are disabled.
- * @mutually_exclusive  Array of mutually exclusive set of cables that cannot
+ * @mutually_exclusive: Array of mutually exclusive set of cables that cannot
  *                      be attached simultaneously. The array should be
  *                      ending with NULL or be NULL (no mutually exclusive
  *                      cables). For example, if it is { 0x7, 0x30, 0}, then,
@@ -87,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
+ * @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
+ * @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
+ * @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
+ * @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
+ * @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,
@@ -137,12 +139,12 @@ struct extcon_dev {
 
 /**
  * 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
+ * @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
  */
 struct extcon_cable {
         struct extcon_dev *edev;
@@ -158,11 +160,11 @@ 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.
- * @cable_index the target cable.
- * @edev        the target extcon device.
- * @previous_value      the saved previous event value.
+ * @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.
+ * @previous_value:     the saved previous event value.
  */
 struct extcon_specific_cable_nb {
         struct notifier_block internal_nb;