projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'jfs-4.9' of git://github.com/kleikamp/linux-shaggy
[cascardo/linux.git]
/
drivers
/
extcon
/
extcon-max8997.c
diff --git
a/drivers/extcon/extcon-max8997.c
b/drivers/extcon/extcon-max8997.c
index
9a89320
..
4a0612f
100644
(file)
--- a/
drivers/extcon/extcon-max8997.c
+++ b/
drivers/extcon/extcon-max8997.c
@@
-331,11
+331,11
@@
static int max8997_muic_handle_usb(struct max8997_muic_info *info,
switch (usb_type) {
case MAX8997_USB_HOST:
switch (usb_type) {
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;
case MAX8997_USB_DEVICE:
break;
case MAX8997_USB_DEVICE:
- extcon_set_
cable_state_
(info->edev, EXTCON_USB, attached);
- extcon_set_
cable_state_
(info->edev, EXTCON_CHG_USB_SDP,
+ extcon_set_
state_sync
(info->edev, EXTCON_USB, attached);
+ extcon_set_
state_sync
(info->edev, EXTCON_CHG_USB_SDP,
attached);
break;
default:
attached);
break;
default:
@@
-361,7
+361,7
@@
static int max8997_muic_handle_dock(struct max8997_muic_info *info,
switch (cable_type) {
case MAX8997_MUIC_ADC_AV_CABLE_NOLOAD:
case MAX8997_MUIC_ADC_FACTORY_MODE_UART_ON:
switch (cable_type) {
case MAX8997_MUIC_ADC_AV_CABLE_NOLOAD:
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;
default:
dev_err(info->dev, "failed to detect %s dock device\n",
break;
default:
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;
break;
case MAX8997_MUIC_ADC_MHL:
return ret;
break;
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;
case MAX8997_MUIC_ADC_FACTORY_MODE_USB_OFF:
case MAX8997_MUIC_ADC_FACTORY_MODE_USB_ON:
break;
case MAX8997_MUIC_ADC_FACTORY_MODE_USB_OFF:
case MAX8997_MUIC_ADC_FACTORY_MODE_USB_ON:
@@
-489,19
+489,19
@@
static int max8997_muic_chg_handler(struct max8997_muic_info *info)
}
break;
case MAX8997_CHARGER_TYPE_DOWNSTREAM_PORT:
}
break;
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);
break;
case MAX8997_CHARGER_TYPE_DEDICATED_CHG:
attached);
break;
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);
break;
case MAX8997_CHARGER_TYPE_500MA:
attached);
break;
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);
break;
case MAX8997_CHARGER_TYPE_1A:
attached);
break;
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);
break;
default:
attached);
break;
default: