iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

extcon: Use the extcon_set_state_sync() instead of deprecated functions

Browse Source 
This patch alters the renamed extcon API to set the state of the external
connectors instead of deprecated extcon_set_cable_state_().

Because the patch[1] modifies the function name to maintain the function
naming pattern.
- extcon_set_cable_state_() -> extcon_set_state_sync()
- extcon_get_cable_state_() -> extcon_get_state()

[1] https://lkml.org/lkml/2016/8/4/729
- extcon: Rename the extcon_set/get_state() to maintain the function naming pattern

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Roger Quadros <rogerq@ti.com>
This commit is contained in:
Chanwoo Choi 2016-08-16 15:55:34 +09:00
parent 525867dbd1
commit 8670b45980
13 changed files with 83 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/extcon/extcon-adc-jack.c
View File

@ -75,7 +75,7 @@ static void adc_jack_handler(struct work_struct *work)
for (i = 0; i < data->num_conditions; i++) { for (i = 0; i < data->num_conditions; i++) {
def = &data->adc_conditions[i]; def = &data->adc_conditions[i];
if (def->min_adc <= adc_val && def->max_adc >= adc_val) { if (def->min_adc <= adc_val && def->max_adc >= adc_val) {
extcon_set_cable_state_(data->edev, def->id, true); extcon_set_state_sync(data->edev, def->id, true);
return; return;
} }
} }
@ -83,7 +83,7 @@ static void adc_jack_handler(struct work_struct *work)
/* Set the detached state if adc value is not included in the range */ /* Set the detached state if adc value is not included in the range */
for (i = 0; i < data->num_conditions; i++) { for (i = 0; i < data->num_conditions; i++) {
def = &data->adc_conditions[i]; def = &data->adc_conditions[i];
extcon_set_cable_state_(data->edev, def->id, false); extcon_set_state_sync(data->edev, def->id, false);
} }
} }

16
drivers/extcon/extcon-arizona.c
View File

@ -614,7 +614,7 @@ static irqreturn_t arizona_hpdet_irq(int irq, void *data)
} }
/* If the cable was removed while measuring ignore the result */ /* If the cable was removed while measuring ignore the result */
ret = extcon_get_cable_state_(info->edev, EXTCON_MECHANICAL); ret = extcon_get_state(info->edev, EXTCON_MECHANICAL);
if (ret < 0) { if (ret < 0) {
dev_err(arizona->dev, "Failed to check cable state: %d\n", dev_err(arizona->dev, "Failed to check cable state: %d\n",
ret); ret);
@ -649,7 +649,7 @@ static irqreturn_t arizona_hpdet_irq(int irq, void *data)
else else
report = EXTCON_JACK_HEADPHONE; report = EXTCON_JACK_HEADPHONE;
ret = extcon_set_cable_state_(info->edev, report, true); ret = extcon_set_state_sync(info->edev, report, true);
if (ret != 0) if (ret != 0)
dev_err(arizona->dev, "Failed to report HP/line: %d\n", dev_err(arizona->dev, "Failed to report HP/line: %d\n",
ret); ret);
@ -732,7 +732,7 @@ err:
ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC); ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC);
/* Just report headphone */ /* Just report headphone */
ret = extcon_set_cable_state_(info->edev, EXTCON_JACK_HEADPHONE, true); ret = extcon_set_state_sync(info->edev, EXTCON_JACK_HEADPHONE, true);
if (ret != 0) if (ret != 0)
dev_err(arizona->dev, "Failed to report headphone: %d\n", ret); dev_err(arizona->dev, "Failed to report headphone: %d\n", ret);
@ -789,7 +789,7 @@ err:
ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC); ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC);
/* Just report headphone */ /* Just report headphone */
ret = extcon_set_cable_state_(info->edev, EXTCON_JACK_HEADPHONE, true); ret = extcon_set_state_sync(info->edev, EXTCON_JACK_HEADPHONE, true);
if (ret != 0) if (ret != 0)
dev_err(arizona->dev, "Failed to report headphone: %d\n", ret); dev_err(arizona->dev, "Failed to report headphone: %d\n", ret);
@ -829,7 +829,7 @@ static void arizona_micd_detect(struct work_struct *work)
mutex_lock(&info->lock); mutex_lock(&info->lock);
/* If the cable was removed while measuring ignore the result */ /* If the cable was removed while measuring ignore the result */
ret = extcon_get_cable_state_(info->edev, EXTCON_MECHANICAL); ret = extcon_get_state(info->edev, EXTCON_MECHANICAL);
if (ret < 0) { if (ret < 0) {
dev_err(arizona->dev, "Failed to check cable state: %d\n", dev_err(arizona->dev, "Failed to check cable state: %d\n",
ret); ret);
@ -914,7 +914,7 @@ static void arizona_micd_detect(struct work_struct *work)
arizona_identify_headphone(info); arizona_identify_headphone(info);
ret = extcon_set_cable_state_(info->edev, ret = extcon_set_state_sync(info->edev,
EXTCON_JACK_MICROPHONE, true); EXTCON_JACK_MICROPHONE, true);
if (ret != 0) if (ret != 0)
dev_err(arizona->dev, "Headset report failed: %d\n", dev_err(arizona->dev, "Headset report failed: %d\n",
@ -1108,7 +1108,7 @@ static irqreturn_t arizona_jackdet(int irq, void *data)
if (info->last_jackdet == present) { if (info->last_jackdet == present) {
dev_dbg(arizona->dev, "Detected jack\n"); dev_dbg(arizona->dev, "Detected jack\n");
ret = extcon_set_cable_state_(info->edev, ret = extcon_set_state_sync(info->edev,
EXTCON_MECHANICAL, true); EXTCON_MECHANICAL, true);
if (ret != 0) if (ret != 0)
@ -1150,7 +1150,7 @@ static irqreturn_t arizona_jackdet(int irq, void *data)
input_sync(info->input); input_sync(info->input);
for (i = 0; i < ARRAY_SIZE(arizona_cable) - 1; i++) { for (i = 0; i < ARRAY_SIZE(arizona_cable) - 1; i++) {
ret = extcon_set_cable_state_(info->edev, ret = extcon_set_state_sync(info->edev,
arizona_cable[i], false); arizona_cable[i], false);
if (ret != 0) if (ret != 0)
dev_err(arizona->dev, dev_err(arizona->dev,

2
drivers/extcon/extcon-axp288.c
View File

@ -226,7 +226,7 @@ notify_otg:
} }
if (notify_charger) if (notify_charger)
extcon_set_cable_state_(info->edev, cable, vbus_attach); extcon_set_state_sync(info->edev, cable, vbus_attach);
/* Clear the flags on disconnect event */ /* Clear the flags on disconnect event */
if (!vbus_attach) if (!vbus_attach)

2
drivers/extcon/extcon-gpio.c
View File

@ -49,7 +49,7 @@ static void gpio_extcon_work(struct work_struct *work)
state = gpiod_get_value_cansleep(data->id_gpiod); state = gpiod_get_value_cansleep(data->id_gpiod);
if (data->pdata->gpio_active_low) if (data->pdata->gpio_active_low)
state = !state; state = !state;
extcon_set_cable_state_(data->edev, data->pdata->extcon_id, state); extcon_set_state_sync(data->edev, data->pdata->extcon_id, state);
} }
static irqreturn_t gpio_irq_handler(int irq, void *dev_id) static irqreturn_t gpio_irq_handler(int irq, void *dev_id)

14
drivers/extcon/extcon-max14577.c
View File

@ -357,7 +357,7 @@ static int max14577_muic_jig_handler(struct max14577_muic_info *info,
if (ret < 0) if (ret < 0)
return ret; return ret;
extcon_set_cable_state_(info->edev, EXTCON_JIG, attached); extcon_set_state_sync(info->edev, EXTCON_JIG, attached);
return 0; return 0;
} }
@ -454,24 +454,24 @@ static int max14577_muic_chg_handler(struct max14577_muic_info *info)
if (ret < 0) if (ret < 0)
return ret; return ret;
extcon_set_cable_state_(info->edev, EXTCON_USB, attached); extcon_set_state_sync(info->edev, EXTCON_USB, attached);
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP,
attached); attached);
break; break;
case MAX14577_CHARGER_TYPE_DEDICATED_CHG: case MAX14577_CHARGER_TYPE_DEDICATED_CHG:
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP,
attached); attached);
break; break;
case MAX14577_CHARGER_TYPE_DOWNSTREAM_PORT: case MAX14577_CHARGER_TYPE_DOWNSTREAM_PORT:
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_CDP, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_CDP,
attached); attached);
break; break;
case MAX14577_CHARGER_TYPE_SPECIAL_500MA: case MAX14577_CHARGER_TYPE_SPECIAL_500MA:
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SLOW, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SLOW,
attached); attached);
break; break;
case MAX14577_CHARGER_TYPE_SPECIAL_1A: case MAX14577_CHARGER_TYPE_SPECIAL_1A:
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_FAST, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_FAST,
attached); attached);
break; break;
case MAX14577_CHARGER_TYPE_NONE: case MAX14577_CHARGER_TYPE_NONE:

8
drivers/extcon/extcon-max3355.c
View File

@ -39,16 +39,16 @@ static irqreturn_t max3355_id_irq(int irq, void *dev_id)
* As we don't have event for USB peripheral cable attached, * As we don't have event for USB peripheral cable attached,
* we simulate USB peripheral attach here. * we simulate USB peripheral attach here.
*/ */
extcon_set_cable_state_(data->edev, EXTCON_USB_HOST, false); extcon_set_state_sync(data->edev, EXTCON_USB_HOST, false);
extcon_set_cable_state_(data->edev, EXTCON_USB, true); extcon_set_state_sync(data->edev, EXTCON_USB, true);
} else { } else {
/* /*
* ID = 0 means USB HOST cable attached. * ID = 0 means USB HOST cable attached.
* As we don't have event for USB peripheral cable detached, * As we don't have event for USB peripheral cable detached,
* we simulate USB peripheral detach here. * we simulate USB peripheral detach here.
*/ */
extcon_set_cable_state_(data->edev, EXTCON_USB, false); extcon_set_state_sync(data->edev, EXTCON_USB, false);
extcon_set_cable_state_(data->edev, EXTCON_USB_HOST, true); extcon_set_state_sync(data->edev, EXTCON_USB_HOST, true);
} }
return IRQ_HANDLED; return IRQ_HANDLED;

46
drivers/extcon/extcon-max77693.c
View File

@ -505,8 +505,8 @@ static int max77693_muic_dock_handler(struct max77693_muic_info *info,
if (ret < 0) if (ret < 0)
return ret; return ret;
extcon_set_cable_state_(info->edev, EXTCON_DOCK, attached); extcon_set_state_sync(info->edev, EXTCON_DOCK, attached);
extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL, attached); extcon_set_state_sync(info->edev, EXTCON_DISP_MHL, attached);
goto out; goto out;
case MAX77693_MUIC_ADC_AUDIO_MODE_REMOTE: /* Dock-Desk */ case MAX77693_MUIC_ADC_AUDIO_MODE_REMOTE: /* Dock-Desk */
dock_id = EXTCON_DOCK; dock_id = EXTCON_DOCK;
@ -514,8 +514,8 @@ static int max77693_muic_dock_handler(struct max77693_muic_info *info,
case MAX77693_MUIC_ADC_AV_CABLE_NOLOAD: /* Dock-Audio */ case MAX77693_MUIC_ADC_AV_CABLE_NOLOAD: /* Dock-Audio */
dock_id = EXTCON_DOCK; dock_id = EXTCON_DOCK;
if (!attached) { if (!attached) {
extcon_set_cable_state_(info->edev, EXTCON_USB, false); extcon_set_state_sync(info->edev, EXTCON_USB, false);
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP,
false); false);
} }
break; break;
@ -530,7 +530,7 @@ static int max77693_muic_dock_handler(struct max77693_muic_info *info,
attached); attached);
if (ret < 0) if (ret < 0)
return ret; return ret;
extcon_set_cable_state_(info->edev, dock_id, attached); extcon_set_state_sync(info->edev, dock_id, attached);
out: out:
return 0; return 0;
@ -596,7 +596,7 @@ static int max77693_muic_adc_ground_handler(struct max77693_muic_info *info)
attached); attached);
if (ret < 0) if (ret < 0)
return ret; return ret;
extcon_set_cable_state_(info->edev, EXTCON_USB_HOST, attached); extcon_set_state_sync(info->edev, EXTCON_USB_HOST, attached);
break; break;
case MAX77693_MUIC_GND_AV_CABLE_LOAD: case MAX77693_MUIC_GND_AV_CABLE_LOAD:
/* Audio Video Cable with load, PATH:AUDIO */ /* Audio Video Cable with load, PATH:AUDIO */
@ -604,14 +604,14 @@ static int max77693_muic_adc_ground_handler(struct max77693_muic_info *info)
attached); attached);
if (ret < 0) if (ret < 0)
return ret; return ret;
extcon_set_cable_state_(info->edev, EXTCON_USB, attached); extcon_set_state_sync(info->edev, EXTCON_USB, attached);
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP,
attached); attached);
break; break;
case MAX77693_MUIC_GND_MHL: case MAX77693_MUIC_GND_MHL:
case MAX77693_MUIC_GND_MHL_VB: case MAX77693_MUIC_GND_MHL_VB:
/* MHL or MHL with USB/TA cable */ /* MHL or MHL with USB/TA cable */
extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL, attached); extcon_set_state_sync(info->edev, EXTCON_DISP_MHL, attached);
break; break;
default: default:
dev_err(info->dev, "failed to detect %s cable of gnd type\n", dev_err(info->dev, "failed to detect %s cable of gnd type\n",
@ -653,7 +653,7 @@ static int max77693_muic_jig_handler(struct max77693_muic_info *info,
if (ret < 0) if (ret < 0)
return ret; return ret;
extcon_set_cable_state_(info->edev, EXTCON_JIG, attached); extcon_set_state_sync(info->edev, EXTCON_JIG, attached);
return 0; return 0;
} }
@ -807,10 +807,10 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info)
* - Support charging through micro-usb port without * - Support charging through micro-usb port without
* data connection * data connection
*/ */
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP,
attached); attached);
if (!cable_attached) if (!cable_attached)
extcon_set_cable_state_(info->edev, extcon_set_state_sync(info->edev,
EXTCON_DISP_MHL, cable_attached); EXTCON_DISP_MHL, cable_attached);
break; break;
} }
@ -834,13 +834,13 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info)
* - Support charging through micro-usb port without * - Support charging through micro-usb port without
* data connection. * data connection.
*/ */
extcon_set_cable_state_(info->edev, EXTCON_USB, extcon_set_state_sync(info->edev, EXTCON_USB,
attached); attached);
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP,
attached); attached);
if (!cable_attached) if (!cable_attached)
extcon_set_cable_state_(info->edev, EXTCON_DOCK, extcon_set_state_sync(info->edev, EXTCON_DOCK,
cable_attached); cable_attached);
break; break;
case MAX77693_MUIC_ADC_RESERVED_ACC_3: /* Dock-Smart */ case MAX77693_MUIC_ADC_RESERVED_ACC_3: /* Dock-Smart */
@ -869,9 +869,9 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info)
if (ret < 0) if (ret < 0)
return ret; return ret;
extcon_set_cable_state_(info->edev, EXTCON_DOCK, extcon_set_state_sync(info->edev, EXTCON_DOCK,
attached); attached);
extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL, extcon_set_state_sync(info->edev, EXTCON_DISP_MHL,
attached); attached);
break; break;
} }
@ -905,28 +905,28 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info)
if (ret < 0) if (ret < 0)
return ret; return ret;
extcon_set_cable_state_(info->edev, EXTCON_USB, extcon_set_state_sync(info->edev, EXTCON_USB,
attached); attached);
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP,
attached); attached);
break; break;
case MAX77693_CHARGER_TYPE_DEDICATED_CHG: case MAX77693_CHARGER_TYPE_DEDICATED_CHG:
/* Only TA cable */ /* Only TA cable */
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP,
attached); attached);
break; break;
} }
break; break;
case MAX77693_CHARGER_TYPE_DOWNSTREAM_PORT: case MAX77693_CHARGER_TYPE_DOWNSTREAM_PORT:
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_CDP, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_CDP,
attached); attached);
break; break;
case MAX77693_CHARGER_TYPE_APPLE_500MA: case MAX77693_CHARGER_TYPE_APPLE_500MA:
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SLOW, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SLOW,
attached); attached);
break; break;
case MAX77693_CHARGER_TYPE_APPLE_1A_2A: case MAX77693_CHARGER_TYPE_APPLE_1A_2A:
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_FAST, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_FAST,
attached); attached);
break; break;
case MAX77693_CHARGER_TYPE_DEAD_BATTERY: case MAX77693_CHARGER_TYPE_DEAD_BATTERY:

22
drivers/extcon/extcon-max77843.c
View File

@ -346,7 +346,7 @@ static int max77843_muic_adc_gnd_handler(struct max77843_muic_info *info)
if (ret < 0) if (ret < 0)
return ret; return ret;
extcon_set_cable_state_(info->edev, EXTCON_USB_HOST, attached); extcon_set_state_sync(info->edev, EXTCON_USB_HOST, attached);
break; break;
case MAX77843_MUIC_GND_MHL_VB: case MAX77843_MUIC_GND_MHL_VB:
case MAX77843_MUIC_GND_MHL: case MAX77843_MUIC_GND_MHL:
@ -356,7 +356,7 @@ static int max77843_muic_adc_gnd_handler(struct max77843_muic_info *info)
if (ret < 0) if (ret < 0)
return ret; return ret;
extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL, attached); extcon_set_state_sync(info->edev, EXTCON_DISP_MHL, attached);
break; break;
default: default:
dev_err(info->dev, "failed to detect %s accessory(gnd:0x%x)\n", dev_err(info->dev, "failed to detect %s accessory(gnd:0x%x)\n",
@ -392,7 +392,7 @@ static int max77843_muic_jig_handler(struct max77843_muic_info *info,
if (ret < 0) if (ret < 0)
return ret; return ret;
extcon_set_cable_state_(info->edev, EXTCON_JIG, attached); extcon_set_state_sync(info->edev, EXTCON_JIG, attached);
return 0; return 0;
} }
@ -486,8 +486,8 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
if (ret < 0) if (ret < 0)
return ret; return ret;
extcon_set_cable_state_(info->edev, EXTCON_USB, attached); extcon_set_state_sync(info->edev, EXTCON_USB, attached);
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP,
attached); attached);
break; break;
case MAX77843_MUIC_CHG_DOWNSTREAM: case MAX77843_MUIC_CHG_DOWNSTREAM:
@ -497,7 +497,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
if (ret < 0) if (ret < 0)
return ret; return ret;
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_CDP, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_CDP,
attached); attached);
break; break;
case MAX77843_MUIC_CHG_DEDICATED: case MAX77843_MUIC_CHG_DEDICATED:
@ -507,7 +507,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
if (ret < 0) if (ret < 0)
return ret; return ret;
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP,
attached); attached);
break; break;
case MAX77843_MUIC_CHG_SPECIAL_500MA: case MAX77843_MUIC_CHG_SPECIAL_500MA:
@ -517,7 +517,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
if (ret < 0) if (ret < 0)
return ret; return ret;
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SLOW, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SLOW,
attached); attached);
break; break;
case MAX77843_MUIC_CHG_SPECIAL_1A: case MAX77843_MUIC_CHG_SPECIAL_1A:
@ -527,7 +527,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
if (ret < 0) if (ret < 0)
return ret; return ret;
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_FAST, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_FAST,
attached); attached);
break; break;
case MAX77843_MUIC_CHG_GND: case MAX77843_MUIC_CHG_GND:
@ -536,10 +536,10 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
/* Charger cable on MHL accessory is attach or detach */ /* Charger cable on MHL accessory is attach or detach */
if (gnd_type == MAX77843_MUIC_GND_MHL_VB) if (gnd_type == MAX77843_MUIC_GND_MHL_VB)
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP,
true); true);
else if (gnd_type == MAX77843_MUIC_GND_MHL) else if (gnd_type == MAX77843_MUIC_GND_MHL)
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP,
false); false);
break; break;
case MAX77843_MUIC_CHG_NONE: case MAX77843_MUIC_CHG_NONE:

20
drivers/extcon/extcon-max8997.c
View File

@ -331,11 +331,11 @@ static int max8997_muic_handle_usb(struct max8997_muic_info *info,
switch (usb_type) { switch (usb_type) {
case MAX8997_USB_HOST: case MAX8997_USB_HOST:
extcon_set_cable_state_(info->edev, EXTCON_USB_HOST, attached); extcon_set_state_sync(info->edev, EXTCON_USB_HOST, attached);
break; break;
case MAX8997_USB_DEVICE: case MAX8997_USB_DEVICE:
extcon_set_cable_state_(info->edev, EXTCON_USB, attached); extcon_set_state_sync(info->edev, EXTCON_USB, attached);
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP,
attached); attached);
break; break;
default: default:
@ -361,7 +361,7 @@ static int max8997_muic_handle_dock(struct max8997_muic_info *info,
switch (cable_type) { switch (cable_type) {
case MAX8997_MUIC_ADC_AV_CABLE_NOLOAD: case MAX8997_MUIC_ADC_AV_CABLE_NOLOAD:
case MAX8997_MUIC_ADC_FACTORY_MODE_UART_ON: case MAX8997_MUIC_ADC_FACTORY_MODE_UART_ON:
extcon_set_cable_state_(info->edev, EXTCON_DOCK, attached); extcon_set_state_sync(info->edev, EXTCON_DOCK, attached);
break; break;
default: default:
dev_err(info->dev, "failed to detect %s dock device\n", dev_err(info->dev, "failed to detect %s dock device\n",
@ -384,7 +384,7 @@ static int max8997_muic_handle_jig_uart(struct max8997_muic_info *info,
return ret; return ret;
} }
extcon_set_cable_state_(info->edev, EXTCON_JIG, attached); extcon_set_state_sync(info->edev, EXTCON_JIG, attached);
return 0; return 0;
} }
@ -406,7 +406,7 @@ static int max8997_muic_adc_handler(struct max8997_muic_info *info)
return ret; return ret;
break; break;
case MAX8997_MUIC_ADC_MHL: case MAX8997_MUIC_ADC_MHL:
extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL, attached); extcon_set_state_sync(info->edev, EXTCON_DISP_MHL, attached);
break; break;
case MAX8997_MUIC_ADC_FACTORY_MODE_USB_OFF: case MAX8997_MUIC_ADC_FACTORY_MODE_USB_OFF:
case MAX8997_MUIC_ADC_FACTORY_MODE_USB_ON: case MAX8997_MUIC_ADC_FACTORY_MODE_USB_ON:
@ -489,19 +489,19 @@ static int max8997_muic_chg_handler(struct max8997_muic_info *info)
} }
break; break;
case MAX8997_CHARGER_TYPE_DOWNSTREAM_PORT: case MAX8997_CHARGER_TYPE_DOWNSTREAM_PORT:
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_CDP, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_CDP,
attached); attached);
break; break;
case MAX8997_CHARGER_TYPE_DEDICATED_CHG: case MAX8997_CHARGER_TYPE_DEDICATED_CHG:
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP,
attached); attached);
break; break;
case MAX8997_CHARGER_TYPE_500MA: case MAX8997_CHARGER_TYPE_500MA:
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SLOW, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SLOW,
attached); attached);
break; break;
case MAX8997_CHARGER_TYPE_1A: case MAX8997_CHARGER_TYPE_1A:
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_FAST, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_FAST,
attached); attached);
break; break;
default: default:

16
drivers/extcon/extcon-palmas.c
View File

@ -61,7 +61,7 @@ static irqreturn_t palmas_vbus_irq_handler(int irq, void *_palmas_usb)
if (vbus_line_state & PALMAS_INT3_LINE_STATE_VBUS) { if (vbus_line_state & PALMAS_INT3_LINE_STATE_VBUS) {
if (palmas_usb->linkstat != PALMAS_USB_STATE_VBUS) { if (palmas_usb->linkstat != PALMAS_USB_STATE_VBUS) {
palmas_usb->linkstat = PALMAS_USB_STATE_VBUS; palmas_usb->linkstat = PALMAS_USB_STATE_VBUS;
extcon_set_cable_state_(edev, EXTCON_USB, true); extcon_set_state_sync(edev, EXTCON_USB, true);
dev_info(palmas_usb->dev, "USB cable is attached\n"); dev_info(palmas_usb->dev, "USB cable is attached\n");
} else { } else {
dev_dbg(palmas_usb->dev, dev_dbg(palmas_usb->dev,
@ -70,7 +70,7 @@ static irqreturn_t palmas_vbus_irq_handler(int irq, void *_palmas_usb)
} else if (!(vbus_line_state & PALMAS_INT3_LINE_STATE_VBUS)) { } else if (!(vbus_line_state & PALMAS_INT3_LINE_STATE_VBUS)) {
if (palmas_usb->linkstat == PALMAS_USB_STATE_VBUS) { if (palmas_usb->linkstat == PALMAS_USB_STATE_VBUS) {
palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT; palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT;
extcon_set_cable_state_(edev, EXTCON_USB, false); extcon_set_state_sync(edev, EXTCON_USB, false);
dev_info(palmas_usb->dev, "USB cable is detached\n"); dev_info(palmas_usb->dev, "USB cable is detached\n");
} else { } else {
dev_dbg(palmas_usb->dev, dev_dbg(palmas_usb->dev,
@ -98,7 +98,7 @@ static irqreturn_t palmas_id_irq_handler(int irq, void *_palmas_usb)
PALMAS_USB_ID_INT_LATCH_CLR, PALMAS_USB_ID_INT_LATCH_CLR,
PALMAS_USB_ID_INT_EN_HI_CLR_ID_GND); PALMAS_USB_ID_INT_EN_HI_CLR_ID_GND);
palmas_usb->linkstat = PALMAS_USB_STATE_ID; palmas_usb->linkstat = PALMAS_USB_STATE_ID;
extcon_set_cable_state_(edev, EXTCON_USB_HOST, true); extcon_set_state_sync(edev, EXTCON_USB_HOST, true);
dev_info(palmas_usb->dev, "USB-HOST cable is attached\n"); dev_info(palmas_usb->dev, "USB-HOST cable is attached\n");
} else if ((set & PALMAS_USB_ID_INT_SRC_ID_FLOAT) && } else if ((set & PALMAS_USB_ID_INT_SRC_ID_FLOAT) &&
(id_src & PALMAS_USB_ID_INT_SRC_ID_FLOAT)) { (id_src & PALMAS_USB_ID_INT_SRC_ID_FLOAT)) {
@ -106,17 +106,17 @@ static irqreturn_t palmas_id_irq_handler(int irq, void *_palmas_usb)
PALMAS_USB_ID_INT_LATCH_CLR, PALMAS_USB_ID_INT_LATCH_CLR,
PALMAS_USB_ID_INT_EN_HI_CLR_ID_FLOAT); PALMAS_USB_ID_INT_EN_HI_CLR_ID_FLOAT);
palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT; palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT;
extcon_set_cable_state_(edev, EXTCON_USB_HOST, false); extcon_set_state_sync(edev, EXTCON_USB_HOST, false);
dev_info(palmas_usb->dev, "USB-HOST cable is detached\n"); dev_info(palmas_usb->dev, "USB-HOST cable is detached\n");
} else if ((palmas_usb->linkstat == PALMAS_USB_STATE_ID) && } else if ((palmas_usb->linkstat == PALMAS_USB_STATE_ID) &&
(!(set & PALMAS_USB_ID_INT_SRC_ID_GND))) { (!(set & PALMAS_USB_ID_INT_SRC_ID_GND))) {
palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT; palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT;
extcon_set_cable_state_(edev, EXTCON_USB_HOST, false); extcon_set_state_sync(edev, EXTCON_USB_HOST, false);
dev_info(palmas_usb->dev, "USB-HOST cable is detached\n"); dev_info(palmas_usb->dev, "USB-HOST cable is detached\n");
} else if ((palmas_usb->linkstat == PALMAS_USB_STATE_DISCONNECT) && } else if ((palmas_usb->linkstat == PALMAS_USB_STATE_DISCONNECT) &&
(id_src & PALMAS_USB_ID_INT_SRC_ID_GND)) { (id_src & PALMAS_USB_ID_INT_SRC_ID_GND)) {
palmas_usb->linkstat = PALMAS_USB_STATE_ID; palmas_usb->linkstat = PALMAS_USB_STATE_ID;
extcon_set_cable_state_(edev, EXTCON_USB_HOST, true); extcon_set_state_sync(edev, EXTCON_USB_HOST, true);
dev_info(palmas_usb->dev, " USB-HOST cable is attached\n"); dev_info(palmas_usb->dev, " USB-HOST cable is attached\n");
} }
@ -137,10 +137,10 @@ static void palmas_gpio_id_detect(struct work_struct *work)
id = gpiod_get_value_cansleep(palmas_usb->id_gpiod); id = gpiod_get_value_cansleep(palmas_usb->id_gpiod);
if (id) { if (id) {
extcon_set_cable_state_(edev, EXTCON_USB_HOST, false); extcon_set_state_sync(edev, EXTCON_USB_HOST, false);
dev_info(palmas_usb->dev, "USB-HOST cable is detached\n"); dev_info(palmas_usb->dev, "USB-HOST cable is detached\n");
} else { } else {
extcon_set_cable_state_(edev, EXTCON_USB_HOST, true); extcon_set_state_sync(edev, EXTCON_USB_HOST, true);
dev_info(palmas_usb->dev, "USB-HOST cable is attached\n"); dev_info(palmas_usb->dev, "USB-HOST cable is attached\n");
} }
} }

4
drivers/extcon/extcon-rt8973a.c
View File

@ -398,9 +398,9 @@ static int rt8973a_muic_cable_handler(struct rt8973a_muic_info *info,
return ret; return ret;
/* Change the state of external accessory */ /* Change the state of external accessory */
extcon_set_cable_state_(info->edev, id, attached); extcon_set_state_sync(info->edev, id, attached);
if (id == EXTCON_USB) if (id == EXTCON_USB)
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP,
attached); attached);
return 0; return 0;

4
drivers/extcon/extcon-sm5502.c
View File

@ -411,9 +411,9 @@ static int sm5502_muic_cable_handler(struct sm5502_muic_info *info,
return ret; return ret;
/* Change the state of external accessory */ /* Change the state of external accessory */
extcon_set_cable_state_(info->edev, id, attached); extcon_set_state_sync(info->edev, id, attached);
if (id == EXTCON_USB) if (id == EXTCON_USB)
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP, extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP,
attached); attached);
return 0; return 0;

8
drivers/extcon/extcon-usb-gpio.c
View File

@ -63,16 +63,16 @@ static void usb_extcon_detect_cable(struct work_struct *work)
* As we don't have event for USB peripheral cable attached, * As we don't have event for USB peripheral cable attached,
* we simulate USB peripheral attach here. * we simulate USB peripheral attach here.
*/ */
extcon_set_cable_state_(info->edev, EXTCON_USB_HOST, false); extcon_set_state_sync(info->edev, EXTCON_USB_HOST, false);
extcon_set_cable_state_(info->edev, EXTCON_USB, true); extcon_set_state_sync(info->edev, EXTCON_USB, true);
} else { } else {
/* /*
* ID = 0 means USB HOST cable attached. * ID = 0 means USB HOST cable attached.
* As we don't have event for USB peripheral cable detached, * As we don't have event for USB peripheral cable detached,
* we simulate USB peripheral detach here. * we simulate USB peripheral detach here.
*/ */
extcon_set_cable_state_(info->edev, EXTCON_USB, false); extcon_set_state_sync(info->edev, EXTCON_USB, false);
extcon_set_cable_state_(info->edev, EXTCON_USB_HOST, true); extcon_set_state_sync(info->edev, EXTCON_USB_HOST, true);
} }
} }