extcon: max8997: Consolidate duplicate code for checking ADC/CHG cable type

This patch make max8997_muic_get_cable_type() function to remove
duplicate code for checking ADC/Charger cable type because almost
internal function need to read adc/chg_type value of MUIC register.

Also, remove *_detach() function, extcon-max8997 driver treat
attach/detach operation of cable in max8997_*_handler() function.
Lastly, this patch move defined constant in header file(include/
linux/mfd/max8997.h, max8997-private.h) because defined constant
is only used in the 'extcon-max8997.c'.

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Myungjoo Ham <myungjoo.ham@samsung.com>

2 files changed, 0 insertions, 24 deletions

diff --git a/include/linux/mfd/max8997-private.h b/include/linux/mfd/max8997-private.h
index cd37a92ccba9..fb465dfbb59e 100644
--- a/include/linux/mfd/max8997-private.h
+++ b/include/linux/mfd/max8997-private.h
@@ -258,15 +258,6 @@ enum max8997_muic_reg {
 #define CONTROL3_BTLDSET_MASK           (0x3 << CONTROL3_BTLDSET_SHIFT)
 #define CONTROL3_ADCDBSET_MASK          (0x3 << CONTROL3_ADCDBSET_SHIFT)
 
-#define MAX8997_ADC_GROUND              0x00
-#define MAX8997_ADC_MHL                 0x01
-#define MAX8997_ADC_JIG_USB_1           0x18
-#define MAX8997_ADC_JIG_USB_2           0x19
-#define MAX8997_ADC_DESKDOCK            0x1a
-#define MAX8997_ADC_JIG_UART            0x1c
-#define MAX8997_ADC_CARDOCK             0x1d
-#define MAX8997_ADC_OPEN                0x1f
-
 enum max8997_haptic_reg {
         MAX8997_HAPTIC_REG_GENERAL      = 0x00,
         MAX8997_HAPTIC_REG_CONF1        = 0x01,
diff --git a/include/linux/mfd/max8997.h b/include/linux/mfd/max8997.h
index 1d4a4fe6ac33..65f8d6a3a608 100644
--- a/include/linux/mfd/max8997.h
+++ b/include/linux/mfd/max8997.h
@@ -78,21 +78,6 @@ struct max8997_regulator_data {
         struct device_node *reg_node;
 };
 
-enum max8997_muic_usb_type {
-        MAX8997_USB_HOST,
-        MAX8997_USB_DEVICE,
-};
-
-enum max8997_muic_charger_type {
-        MAX8997_CHARGER_TYPE_NONE = 0,
-        MAX8997_CHARGER_TYPE_USB,
-        MAX8997_CHARGER_TYPE_DOWNSTREAM_PORT,
-        MAX8997_CHARGER_TYPE_DEDICATED_CHG,
-        MAX8997_CHARGER_TYPE_500MA,
-        MAX8997_CHARGER_TYPE_1A,
-        MAX8997_CHARGER_TYPE_DEAD_BATTERY = 7,
-};
-
 struct max8997_muic_reg_data {
         u8 addr;
         u8 data;