Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8670b459 authored by Chanwoo Choi's avatar Chanwoo Choi
Browse files

extcon: Use the extcon_set_state_sync() instead of deprecated functions 

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: default avatarChanwoo Choi <cw00.choi@samsung.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: default avatarRoger Quadros <rogerq@ti.com>
parent 525867db

drivers/extcon/extcon-adc-jack.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	}

}

drivers/extcon/extcon-arizona.c

+8 −8
Original line number Diff line number Diff line
@@ -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 @@ static void arizona_identify_headphone(struct arizona_extcon_info *info) 
			   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 @@ static void arizona_start_hpdet_acc_id(struct arizona_extcon_info *info) 
			   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,

drivers/extcon/extcon-axp288.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info) 
	}



	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)

drivers/extcon/extcon-gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/extcon/extcon-max14577.c

+7 −7
Original line number Diff line number Diff line
@@ -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: