Merge tag 'extcon-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next

Chanwoo writes:

	This is small fixes for extcon driver.

	MAX77693 extcon driver
	- Add 'static' keryword to internal data structure
	- Fix return value using 'ret' instead of hardcoding

	MAX8997 extcon driver
	- Use dev_err() instead of pr_err()
	- Fix return value using 'ret' instead of hardcoding

2 files changed, 11 insertions, 11 deletions

diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c
index 8f3c947b0029..b56bdaa27d4b 100644
--- a/drivers/extcon/extcon-max77693.c
+++ b/drivers/extcon/extcon-max77693.c
@@ -38,7 +38,7 @@
  * extcon-max77693 driver use 'default_init_data' to bring up base operation
  * of MAX77693 MUIC device.
  */
-struct max77693_reg_data default_init_data[] = {
+static struct max77693_reg_data default_init_data[] = {
         {
                 /* STATUS2 - [3]ChgDetRun */
                 .addr = MAX77693_MUIC_REG_STATUS2,
@@ -258,7 +258,7 @@ static int max77693_muic_set_debounce_time(struct max77693_muic_info *info,
                                           CONTROL3_ADCDBSET_MASK);
                 if (ret) {
                         dev_err(info->dev, "failed to set ADC debounce time\n");
-                        return -EAGAIN;
+                        return ret;
                 }
                 break;
         default:
@@ -294,7 +294,7 @@ static int max77693_muic_set_path(struct max77693_muic_info *info,
                         MAX77693_MUIC_REG_CTRL1, ctrl1, COMP_SW_MASK);
         if (ret < 0) {
                 dev_err(info->dev, "failed to update MUIC register\n");
-                return -EAGAIN;
+                return ret;
         }
 
         if (attached)
@@ -307,7 +307,7 @@ static int max77693_muic_set_path(struct max77693_muic_info *info,
                         CONTROL2_LOWPWR_MASK | CONTROL2_CPEN_MASK);
         if (ret < 0) {
                 dev_err(info->dev, "failed to update MUIC register\n");
-                return -EAGAIN;
+                return ret;
         }
 
         dev_info(info->dev,
@@ -1035,7 +1035,7 @@ static int max77693_muic_detect_accessory(struct max77693_muic_info *info)
         if (ret) {
                 dev_err(info->dev, "failed to read MUIC register\n");
                 mutex_unlock(&info->mutex);
-                return -EINVAL;
+                return ret;
         }
 
         adc = max77693_muic_get_cable_type(info, MAX77693_CABLE_GROUP_ADC,
diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
index 69641bcae325..67d6738d85a0 100644
--- a/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@ -196,7 +196,7 @@ static int max8997_muic_set_debounce_time(struct max8997_muic_info *info,
                                           CONTROL3_ADCDBSET_MASK);
                 if (ret) {
                         dev_err(info->dev, "failed to set ADC debounce time\n");
-                        return -EAGAIN;
+                        return ret;
                 }
                 break;
         default:
@@ -232,7 +232,7 @@ static int max8997_muic_set_path(struct max8997_muic_info *info,
                         MAX8997_MUIC_REG_CONTROL1, ctrl1, COMP_SW_MASK);
         if (ret < 0) {
                 dev_err(info->dev, "failed to update MUIC register\n");
-                return -EAGAIN;
+                return ret;
         }
 
         if (attached)
@@ -245,7 +245,7 @@ static int max8997_muic_set_path(struct max8997_muic_info *info,
                         CONTROL2_LOWPWR_MASK | CONTROL2_CPEN_MASK);
         if (ret < 0) {
                 dev_err(info->dev, "failed to update MUIC register\n");
-                return -EAGAIN;
+                return ret;
         }
 
         dev_info(info->dev,
@@ -397,7 +397,7 @@ static int max8997_muic_handle_jig_uart(struct max8997_muic_info *info,
         ret = max8997_muic_set_path(info, info->path_uart, attached);
         if (ret) {
                 dev_err(info->dev, "failed to update muic register\n");
-                return -EINVAL;
+                return ret;
         }
 
         extcon_set_cable_state(info->edev, "JIG", attached);
@@ -608,7 +608,7 @@ static int max8997_muic_detect_dev(struct max8997_muic_info *info)
         if (ret) {
                 dev_err(info->dev, "failed to read MUIC register\n");
                 mutex_unlock(&info->mutex);
-                return -EINVAL;
+                return ret;
         }
 
         adc = max8997_muic_get_cable_type(info, MAX8997_CABLE_GROUP_ADC,
@@ -646,7 +646,7 @@ static void max8997_muic_detect_cable_wq(struct work_struct *work)
 
         ret = max8997_muic_detect_dev(info);
         if (ret < 0)
-                pr_err("failed to detect cable type\n");
+                dev_err(info->dev, "failed to detect cable type\n");
 }
 
 static int max8997_muic_probe(struct platform_device *pdev)