lkml.org 
[lkml]   [2016]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] extcon: Use the extcon_set_state_sync() instead of deprecated functions
    Date
    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

    Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
    Cc: Roger Quadros <rogerq@ti.com>
    Cc: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
    Cc: Chen-Yu Tsai <wens@csie.org>
    Cc: Ramakrishna Pallala <ramakrishna.pallala@intel.com>
    Cc: Kishon Vijay Abraham I <kishon@ti.com>
    Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
    ---
    drivers/extcon/extcon-adc-jack.c | 4 ++--
    drivers/extcon/extcon-arizona.c | 16 +++++++-------
    drivers/extcon/extcon-axp288.c | 2 +-
    drivers/extcon/extcon-gpio.c | 2 +-
    drivers/extcon/extcon-max14577.c | 14 ++++++------
    drivers/extcon/extcon-max3355.c | 8 +++----
    drivers/extcon/extcon-max77693.c | 46 ++++++++++++++++++++--------------------
    drivers/extcon/extcon-max77843.c | 22 +++++++++----------
    drivers/extcon/extcon-max8997.c | 20 ++++++++---------
    drivers/extcon/extcon-palmas.c | 16 +++++++-------
    drivers/extcon/extcon-rt8973a.c | 4 ++--
    drivers/extcon/extcon-sm5502.c | 4 ++--
    drivers/extcon/extcon-usb-gpio.c | 8 +++----
    13 files changed, 83 insertions(+), 83 deletions(-)

    diff --git a/drivers/extcon/extcon-adc-jack.c b/drivers/extcon/extcon-adc-jack.c
    index e62e6cd7e00a..bc538708c753 100644
    --- a/drivers/extcon/extcon-adc-jack.c
    +++ b/drivers/extcon/extcon-adc-jack.c
    @@ -75,7 +75,7 @@ static void adc_jack_handler(struct work_struct *work)
    for (i = 0; i < data->num_conditions; i++) {
    def = &data->adc_conditions[i];
    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;
    }
    }
    @@ -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 */
    for (i = 0; i < data->num_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);
    }
    }

    diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
    index 493bd9fe5f67..56e6c4c7c60d 100644
    --- a/drivers/extcon/extcon-arizona.c
    +++ b/drivers/extcon/extcon-arizona.c
    @@ -614,7 +614,7 @@ static irqreturn_t arizona_hpdet_irq(int irq, void *data)
    }

    /* 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) {
    dev_err(arizona->dev, "Failed to check cable state: %d\n",
    ret);
    @@ -649,7 +649,7 @@ static irqreturn_t arizona_hpdet_irq(int irq, void *data)
    else
    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)
    dev_err(arizona->dev, "Failed to report HP/line: %d\n",
    ret);
    @@ -732,7 +732,7 @@ err:
    ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC);

    /* 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)
    dev_err(arizona->dev, "Failed to report headphone: %d\n", ret);

    @@ -789,7 +789,7 @@ err:
    ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC);

    /* 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)
    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);

    /* 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) {
    dev_err(arizona->dev, "Failed to check cable state: %d\n",
    ret);
    @@ -914,7 +914,7 @@ static void arizona_micd_detect(struct work_struct *work)

    arizona_identify_headphone(info);

    - ret = extcon_set_cable_state_(info->edev,
    + ret = extcon_set_state_sync(info->edev,
    EXTCON_JACK_MICROPHONE, true);
    if (ret != 0)
    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) {
    dev_dbg(arizona->dev, "Detected jack\n");
    - ret = extcon_set_cable_state_(info->edev,
    + ret = extcon_set_state_sync(info->edev,
    EXTCON_MECHANICAL, true);

    if (ret != 0)
    @@ -1150,7 +1150,7 @@ static irqreturn_t arizona_jackdet(int irq, void *data)
    input_sync(info->input);

    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);
    if (ret != 0)
    dev_err(arizona->dev,
    diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
    index fd55c2f2080a..03fab5367181 100644
    --- a/drivers/extcon/extcon-axp288.c
    +++ b/drivers/extcon/extcon-axp288.c
    @@ -226,7 +226,7 @@ notify_otg:
    }

    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 */
    if (!vbus_attach)
    diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c
    index b1b0264eb12d..e7aebbc945f6 100644
    --- a/drivers/extcon/extcon-gpio.c
    +++ b/drivers/extcon/extcon-gpio.c
    @@ -49,7 +49,7 @@ static void gpio_extcon_work(struct work_struct *work)
    state = gpiod_get_value_cansleep(data->id_gpiod);
    if (data->pdata->gpio_active_low)
    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)
    diff --git a/drivers/extcon/extcon-max14577.c b/drivers/extcon/extcon-max14577.c
    index 852a7112f451..66ff7c9e7a7b 100644
    --- a/drivers/extcon/extcon-max14577.c
    +++ b/drivers/extcon/extcon-max14577.c
    @@ -357,7 +357,7 @@ static int max14577_muic_jig_handler(struct max14577_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;
    }
    @@ -454,24 +454,24 @@ static int max14577_muic_chg_handler(struct max14577_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 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);
    break;
    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);
    break;
    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);
    break;
    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);
    break;
    case MAX14577_CHARGER_TYPE_NONE:
    diff --git a/drivers/extcon/extcon-max3355.c b/drivers/extcon/extcon-max3355.c
    index c24abec5d06c..533e16a952b8 100644
    --- a/drivers/extcon/extcon-max3355.c
    +++ b/drivers/extcon/extcon-max3355.c
    @@ -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,
    * we simulate USB peripheral attach here.
    */
    - extcon_set_cable_state_(data->edev, EXTCON_USB_HOST, false);
    - extcon_set_cable_state_(data->edev, EXTCON_USB, true);
    + extcon_set_state_sync(data->edev, EXTCON_USB_HOST, false);
    + extcon_set_state_sync(data->edev, EXTCON_USB, true);
    } else {
    /*
    * ID = 0 means USB HOST cable attached.
    * As we don't have event for USB peripheral cable detached,
    * we simulate USB peripheral detach here.
    */
    - extcon_set_cable_state_(data->edev, EXTCON_USB, false);
    - extcon_set_cable_state_(data->edev, EXTCON_USB_HOST, true);
    + extcon_set_state_sync(data->edev, EXTCON_USB, false);
    + extcon_set_state_sync(data->edev, EXTCON_USB_HOST, true);
    }

    return IRQ_HANDLED;
    diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c
    index f17cb76b567c..68dbcb814b2f 100644
    --- a/drivers/extcon/extcon-max77693.c
    +++ b/drivers/extcon/extcon-max77693.c
    @@ -505,8 +505,8 @@ static int max77693_muic_dock_handler(struct max77693_muic_info *info,
    if (ret < 0)
    return ret;

    - extcon_set_cable_state_(info->edev, EXTCON_DOCK, attached);
    - extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL, attached);
    + extcon_set_state_sync(info->edev, EXTCON_DOCK, attached);
    + extcon_set_state_sync(info->edev, EXTCON_DISP_MHL, attached);
    goto out;
    case MAX77693_MUIC_ADC_AUDIO_MODE_REMOTE: /* Dock-Desk */
    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 */
    dock_id = EXTCON_DOCK;
    if (!attached) {
    - extcon_set_cable_state_(info->edev, EXTCON_USB, false);
    - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,
    + extcon_set_state_sync(info->edev, EXTCON_USB, false);
    + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP,
    false);
    }
    break;
    @@ -530,7 +530,7 @@ static int max77693_muic_dock_handler(struct max77693_muic_info *info,
    attached);
    if (ret < 0)
    return ret;
    - extcon_set_cable_state_(info->edev, dock_id, attached);
    + extcon_set_state_sync(info->edev, dock_id, attached);

    out:
    return 0;
    @@ -596,7 +596,7 @@ static int max77693_muic_adc_ground_handler(struct max77693_muic_info *info)
    attached);
    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 MAX77693_MUIC_GND_AV_CABLE_LOAD:
    /* Audio Video Cable with load, PATH:AUDIO */
    @@ -604,14 +604,14 @@ static int max77693_muic_adc_ground_handler(struct max77693_muic_info *info)
    attached);
    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 MAX77693_MUIC_GND_MHL:
    case MAX77693_MUIC_GND_MHL_VB:
    /* 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;
    default:
    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)
    return ret;

    - extcon_set_cable_state_(info->edev, EXTCON_JIG, attached);
    + extcon_set_state_sync(info->edev, EXTCON_JIG, attached);

    return 0;
    }
    @@ -807,10 +807,10 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info)
    * - Support charging through micro-usb port without
    * data connection
    */
    - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP,
    + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP,
    attached);
    if (!cable_attached)
    - extcon_set_cable_state_(info->edev,
    + extcon_set_state_sync(info->edev,
    EXTCON_DISP_MHL, cable_attached);
    break;
    }
    @@ -834,13 +834,13 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info)
    * - Support charging through micro-usb port without
    * data connection.
    */
    - extcon_set_cable_state_(info->edev, EXTCON_USB,
    + 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);

    if (!cable_attached)
    - extcon_set_cable_state_(info->edev, EXTCON_DOCK,
    + extcon_set_state_sync(info->edev, EXTCON_DOCK,
    cable_attached);
    break;
    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)
    return ret;

    - extcon_set_cable_state_(info->edev, EXTCON_DOCK,
    + extcon_set_state_sync(info->edev, EXTCON_DOCK,
    attached);
    - extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL,
    + extcon_set_state_sync(info->edev, EXTCON_DISP_MHL,
    attached);
    break;
    }
    @@ -905,28 +905,28 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info)
    if (ret < 0)
    return ret;

    - extcon_set_cable_state_(info->edev, EXTCON_USB,
    + 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);
    break;
    case MAX77693_CHARGER_TYPE_DEDICATED_CHG:
    /* Only TA cable */
    - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP,
    + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP,
    attached);
    break;
    }
    break;
    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);
    break;
    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);
    break;
    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);
    break;
    case MAX77693_CHARGER_TYPE_DEAD_BATTERY:
    diff --git a/drivers/extcon/extcon-max77843.c b/drivers/extcon/extcon-max77843.c
    index b188bd650efa..5d11fdf36e94 100644
    --- 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:
    diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
    index 9a89320d09a8..4a0612fb9c07 100644
    --- 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:
    - 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:
    - 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:
    @@ -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:
    - 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",
    @@ -384,7 +384,7 @@ static int max8997_muic_handle_jig_uart(struct max8997_muic_info *info,
    return ret;
    }

    - extcon_set_cable_state_(info->edev, EXTCON_JIG, attached);
    + extcon_set_state_sync(info->edev, EXTCON_JIG, attached);

    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:
    - 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:
    @@ -489,19 +489,19 @@ static int max8997_muic_chg_handler(struct max8997_muic_info *info)
    }
    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:
    - 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:
    - 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:
    - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_FAST,
    + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_FAST,
    attached);
    break;
    default:
    diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c
    index caff46c0e214..634ba70782de 100644
    --- a/drivers/extcon/extcon-palmas.c
    +++ b/drivers/extcon/extcon-palmas.c
    @@ -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 (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");
    } else {
    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)) {
    if (palmas_usb->linkstat == PALMAS_USB_STATE_VBUS) {
    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");
    } else {
    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_EN_HI_CLR_ID_GND);
    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");
    } else if ((set & 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_EN_HI_CLR_ID_FLOAT);
    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");
    } else if ((palmas_usb->linkstat == PALMAS_USB_STATE_ID) &&
    (!(set & PALMAS_USB_ID_INT_SRC_ID_GND))) {
    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");
    } else if ((palmas_usb->linkstat == PALMAS_USB_STATE_DISCONNECT) &&
    (id_src & PALMAS_USB_ID_INT_SRC_ID_GND)) {
    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");
    }

    @@ -137,10 +137,10 @@ static void palmas_gpio_id_detect(struct work_struct *work)
    id = gpiod_get_value_cansleep(palmas_usb->id_gpiod);

    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");
    } 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");
    }
    }
    diff --git a/drivers/extcon/extcon-rt8973a.c b/drivers/extcon/extcon-rt8973a.c
    index 97e074d70eca..174c388739ea 100644
    --- a/drivers/extcon/extcon-rt8973a.c
    +++ b/drivers/extcon/extcon-rt8973a.c
    @@ -398,9 +398,9 @@ static int rt8973a_muic_cable_handler(struct rt8973a_muic_info *info,
    return ret;

    /* 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)
    - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,
    + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP,
    attached);

    return 0;
    diff --git a/drivers/extcon/extcon-sm5502.c b/drivers/extcon/extcon-sm5502.c
    index df769a17e736..b22325688503 100644
    --- a/drivers/extcon/extcon-sm5502.c
    +++ b/drivers/extcon/extcon-sm5502.c
    @@ -411,9 +411,9 @@ static int sm5502_muic_cable_handler(struct sm5502_muic_info *info,
    return ret;

    /* 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)
    - extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,
    + extcon_set_state_sync(info->edev, EXTCON_CHG_USB_SDP,
    attached);

    return 0;
    diff --git a/drivers/extcon/extcon-usb-gpio.c b/drivers/extcon/extcon-usb-gpio.c
    index 2512660dc4b9..a27d350f69e3 100644
    --- a/drivers/extcon/extcon-usb-gpio.c
    +++ b/drivers/extcon/extcon-usb-gpio.c
    @@ -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,
    * we simulate USB peripheral attach here.
    */
    - extcon_set_cable_state_(info->edev, EXTCON_USB_HOST, false);
    - extcon_set_cable_state_(info->edev, EXTCON_USB, true);
    + extcon_set_state_sync(info->edev, EXTCON_USB_HOST, false);
    + extcon_set_state_sync(info->edev, EXTCON_USB, true);
    } else {
    /*
    * ID = 0 means USB HOST cable attached.
    * As we don't have event for USB peripheral cable detached,
    * we simulate USB peripheral detach here.
    */
    - extcon_set_cable_state_(info->edev, EXTCON_USB, false);
    - extcon_set_cable_state_(info->edev, EXTCON_USB_HOST, true);
    + extcon_set_state_sync(info->edev, EXTCON_USB, false);
    + extcon_set_state_sync(info->edev, EXTCON_USB_HOST, true);
    }
    }

    --
    1.9.1
    \
     
     \ /
      Last update: 2016-09-17 09:57    [W:7.491 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site