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

Commit ef70a214 authored by Chanwoo Choi's avatar Chanwoo Choi
Browse files

extcon: arizona: Use devm_extcon_dev_allocate for extcon_dev 



This patch use devm_extcon_dev_allocate() to simplify the memory control
of extcon device.

Cc: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: patches@opensource.wolfsonmicro.com
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Reviewed-by: default avatarFelipe Balbi <balbi@ti.com>
parent 0604002c

drivers/extcon/extcon-arizona.c

+17 −13
Original line number Original line Diff line number Diff line
@@ -91,7 +91,7 @@ struct arizona_extcon_info { 




	int hpdet_ip;

	int hpdet_ip;





	struct extcon_dev edev;

	struct extcon_dev *edev;

};

};





static const struct arizona_micd_config micd_default_modes[] = {

static const struct arizona_micd_config micd_default_modes[] = {
@@ -546,7 +546,7 @@ static irqreturn_t arizona_hpdet_irq(int irq, void *data) 
	}

	}





	/* If the cable was removed while measuring ignore the result */

	/* If the cable was removed while measuring ignore the result */

	ret = extcon_get_cable_state_(&info->edev, ARIZONA_CABLE_MECHANICAL);

	ret = extcon_get_cable_state_(info->edev, ARIZONA_CABLE_MECHANICAL);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(arizona->dev, "Failed to check cable state: %d\n",

		dev_err(arizona->dev, "Failed to check cable state: %d\n",

			ret);

			ret);
@@ -581,7 +581,7 @@ static irqreturn_t arizona_hpdet_irq(int irq, void *data) 
	else

	else

		report = ARIZONA_CABLE_HEADPHONE;

		report = ARIZONA_CABLE_HEADPHONE;





	ret = extcon_set_cable_state_(&info->edev, report, true);

	ret = extcon_set_cable_state_(info->edev, report, true);

	if (ret != 0)

	if (ret != 0)

		dev_err(arizona->dev, "Failed to report HP/line: %d\n",

		dev_err(arizona->dev, "Failed to report HP/line: %d\n",

			ret);

			ret);
@@ -664,7 +664,7 @@ static void arizona_identify_headphone(struct arizona_extcon_info *info) 
			   ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC);

			   ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC);





	/* Just report headphone */

	/* Just report headphone */

	ret = extcon_update_state(&info->edev,

	ret = extcon_update_state(info->edev,

				  1 << ARIZONA_CABLE_HEADPHONE,

				  1 << ARIZONA_CABLE_HEADPHONE,

				  1 << ARIZONA_CABLE_HEADPHONE);

				  1 << ARIZONA_CABLE_HEADPHONE);

	if (ret != 0)

	if (ret != 0)
@@ -723,7 +723,7 @@ static void arizona_start_hpdet_acc_id(struct arizona_extcon_info *info) 
			   ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC);

			   ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC);





	/* Just report headphone */

	/* Just report headphone */

	ret = extcon_update_state(&info->edev,

	ret = extcon_update_state(info->edev,

				  1 << ARIZONA_CABLE_HEADPHONE,

				  1 << ARIZONA_CABLE_HEADPHONE,

				  1 << ARIZONA_CABLE_HEADPHONE);

				  1 << ARIZONA_CABLE_HEADPHONE);

	if (ret != 0)

	if (ret != 0)
@@ -764,7 +764,7 @@ static void arizona_micd_detect(struct work_struct *work) 
	mutex_lock(&info->lock);

	mutex_lock(&info->lock);





	/* If the cable was removed while measuring ignore the result */

	/* If the cable was removed while measuring ignore the result */

	ret = extcon_get_cable_state_(&info->edev, ARIZONA_CABLE_MECHANICAL);

	ret = extcon_get_cable_state_(info->edev, ARIZONA_CABLE_MECHANICAL);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(arizona->dev, "Failed to check cable state: %d\n",

		dev_err(arizona->dev, "Failed to check cable state: %d\n",

				ret);

				ret);
@@ -812,7 +812,7 @@ static void arizona_micd_detect(struct work_struct *work) 
	if (info->detecting && (val & ARIZONA_MICD_LVL_8)) {

	if (info->detecting && (val & ARIZONA_MICD_LVL_8)) {

		arizona_identify_headphone(info);

		arizona_identify_headphone(info);





		ret = extcon_update_state(&info->edev,

		ret = extcon_update_state(info->edev,

					  1 << ARIZONA_CABLE_MICROPHONE,

					  1 << ARIZONA_CABLE_MICROPHONE,

					  1 << ARIZONA_CABLE_MICROPHONE);

					  1 << ARIZONA_CABLE_MICROPHONE);
@@ -999,7 +999,7 @@ static irqreturn_t arizona_jackdet(int irq, void *data) 




	if (info->last_jackdet == present) {

	if (info->last_jackdet == present) {

		dev_dbg(arizona->dev, "Detected jack\n");

		dev_dbg(arizona->dev, "Detected jack\n");

		ret = extcon_set_cable_state_(&info->edev,

		ret = extcon_set_cable_state_(info->edev,

					      ARIZONA_CABLE_MECHANICAL, true);

					      ARIZONA_CABLE_MECHANICAL, true);





		if (ret != 0)

		if (ret != 0)
@@ -1038,7 +1038,7 @@ static irqreturn_t arizona_jackdet(int irq, void *data) 
					 info->micd_ranges[i].key, 0);

					 info->micd_ranges[i].key, 0);

		input_sync(info->input);

		input_sync(info->input);





		ret = extcon_update_state(&info->edev, 0xffffffff, 0);

		ret = extcon_update_state(info->edev, 0xffffffff, 0);

		if (ret != 0)

		if (ret != 0)

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

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

				ret);

				ret);
@@ -1150,11 +1150,15 @@ static int arizona_extcon_probe(struct platform_device *pdev) 
		break;

		break;

	}

	}





	info->edev.name = "Headset Jack";

	info->edev = devm_extcon_dev_allocate(&pdev->dev, arizona_cable);

	info->edev.dev.parent = arizona->dev;

	if (IS_ERR(info->edev)) {

	info->edev.supported_cable = arizona_cable;

		dev_err(&pdev->dev, "failed to allocate extcon device\n");

		return -ENOMEM;

	}

	info->edev->name = "Headset Jack";

	info->edev->dev.parent = arizona->dev;





	ret = devm_extcon_dev_register(&pdev->dev, &info->edev);

	ret = devm_extcon_dev_register(&pdev->dev, info->edev);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(arizona->dev, "extcon_dev_register() failed: %d\n",

		dev_err(arizona->dev, "extcon_dev_register() failed: %d\n",

			ret);

			ret);