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

Commit 34602486 authored by Nikesh Oswal's avatar Nikesh Oswal Committed by Chanwoo Choi
Browse files

extcon: arizona: Use extcon cable API with index of extcon cable instead of string 



Use extcon cable API instead of state API as it is much more
idiomatic.

Signed-off-by: default avatarNikesh Oswal <Nikesh.Oswal@wolfsonmicro.com>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
[Modify patch title by Chanwoo Choi]
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent 5a8844b5

drivers/extcon/extcon-arizona.c

+6 −9
Original line number Diff line number Diff line
@@ -669,9 +669,8 @@ static void arizona_identify_headphone(struct arizona_extcon_info *info) 
			   ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC);



	/* Just report headphone */

	ret = extcon_update_state(info->edev,

				  1 << ARIZONA_CABLE_HEADPHONE,

				  1 << ARIZONA_CABLE_HEADPHONE);

	ret = extcon_set_cable_state_(info->edev,

				      ARIZONA_CABLE_HEADPHONE, true);

	if (ret != 0)

		dev_err(arizona->dev, "Failed to report headphone: %d\n", ret);
@@ -728,9 +727,8 @@ 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_update_state(info->edev,

				  1 << ARIZONA_CABLE_HEADPHONE,

				  1 << ARIZONA_CABLE_HEADPHONE);

	ret = extcon_set_cable_state_(info->edev,

				      ARIZONA_CABLE_HEADPHONE, true);

	if (ret != 0)

		dev_err(arizona->dev, "Failed to report headphone: %d\n", ret);
@@ -817,9 +815,8 @@ static void arizona_micd_detect(struct work_struct *work) 
	if (info->detecting && (val & ARIZONA_MICD_LVL_8)) {

		arizona_identify_headphone(info);



		ret = extcon_update_state(info->edev,

					  1 << ARIZONA_CABLE_MICROPHONE,

					  1 << ARIZONA_CABLE_MICROPHONE);

		ret = extcon_set_cable_state_(info->edev,

					      ARIZONA_CABLE_MICROPHONE, true);



		if (ret != 0)

			dev_err(arizona->dev, "Headset report failed: %d\n",