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

Commit 577bef11 authored by Chanwoo Choi's avatar Chanwoo Choi
Browse files

extcon: max77693: Use devm_extcon_dev_allocate for extcon_dev 



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

Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Reviewed-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: default avatarFelipe Balbi <balbi@ti.com>
parent 22f9afb9

drivers/extcon/extcon-max77693.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -1175,23 +1175,22 @@ static int max77693_muic_probe(struct platform_device *pdev) 
	}

	}





	/* Initialize extcon device */

	/* Initialize extcon device */

	info->edev = devm_kzalloc(&pdev->dev, sizeof(struct extcon_dev),

	info->edev = devm_extcon_dev_allocate(&pdev->dev,

				  GFP_KERNEL);

					      max77693_extcon_cable);

	if (!info->edev) {

	if (IS_ERR(info->edev)) {

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

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

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto err_irq;

		goto err_irq;

	}

	}

	info->edev->name = DEV_NAME;

	info->edev->name = DEV_NAME;

	info->edev->dev.parent = &pdev->dev;

	info->edev->dev.parent = &pdev->dev;

	info->edev->supported_cable = max77693_extcon_cable;



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

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

	if (ret) {

	if (ret) {

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

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

		goto err_irq;

		goto err_irq;

	}

	}







	/* Initialize MUIC register by using platform data or default data */

	/* Initialize MUIC register by using platform data or default data */

	if (pdata && pdata->muic_data) {

	if (pdata && pdata->muic_data) {

		init_data = pdata->muic_data->init_data;

		init_data = pdata->muic_data->init_data;