Merge tag 'gfs2-4.8.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2...

[cascardo/linux.git] / drivers / extcon / extcon-max77843.c

diff --git a/drivers/extcon/extcon-max77843.c b/drivers/extcon/extcon-max77843.c
index b188bd6..5d11fdf 100644 (file)
--- a/drivers/extcon/extcon-max77843.c
+++ b/drivers/extcon/extcon-max77843.c
@@ -346,7 +346,7 @@ static int max77843_muic_adc_gnd_handler(struct max77843_muic_info *info)
                if (ret < 0)
                        return ret;
 
-               extcon_set_cable_state_(info->edev, EXTCON_USB_HOST, attached);
+               extcon_set_state_sync(info->edev, EXTCON_USB_HOST, attached);
                break;
        case MAX77843_MUIC_GND_MHL_VB:
        case MAX77843_MUIC_GND_MHL:
@@ -356,7 +356,7 @@ static int max77843_muic_adc_gnd_handler(struct max77843_muic_info *info)
                if (ret < 0)
                        return ret;
 
-               extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL, attached);
+               extcon_set_state_sync(info->edev, EXTCON_DISP_MHL, attached);
                break;
        default:
                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)
                return ret;
 
-       extcon_set_cable_state_(info->edev, EXTCON_JIG, attached);
+       extcon_set_state_sync(info->edev, EXTCON_JIG, attached);
 
        return 0;
 }
@@ -486,8 +486,8 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
                if (ret < 0)
                        return ret;
 
-               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;
        case MAX77843_MUIC_CHG_DOWNSTREAM:
@@ -497,7 +497,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
                if (ret < 0)
                        return ret;
 
-               extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_CDP,
+               extcon_set_state_sync(info->edev, EXTCON_CHG_USB_CDP,
                                        attached);
                break;
        case MAX77843_MUIC_CHG_DEDICATED:
@@ -507,7 +507,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
                if (ret < 0)
                        return ret;
 
-               extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP,
+               extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP,
                                        attached);
                break;
        case MAX77843_MUIC_CHG_SPECIAL_500MA:
@@ -517,7 +517,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
                if (ret < 0)
                        return ret;
 
-               extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SLOW,
+               extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SLOW,
                                        attached);
                break;
        case MAX77843_MUIC_CHG_SPECIAL_1A:
@@ -527,7 +527,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
                if (ret < 0)
                        return ret;
 
-               extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_FAST,
+               extcon_set_state_sync(info->edev, EXTCON_CHG_USB_FAST,
                                        attached);
                break;
        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 */
                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);
                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);
                break;
        case MAX77843_MUIC_CHG_NONE: