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

Commit d7290cd0 authored by Chuhong Yuan's avatar Chuhong Yuan Committed by Greg Kroah-Hartman
Browse files

usb: chipidea: msm: Use device-managed registration API 



Use devm_reset_controller_register to get rid
of manual unregistration.

Signed-off-by: default avatarChuhong Yuan <hslester96@gmail.com>
Link: https://lore.kernel.org/r/20190902014323.27588-1-hslester96@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ee6754ac

drivers/usb/chipidea/ci_hdrc_msm.c

+3 −6
Original line number Diff line number Diff line
@@ -216,13 +216,13 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) 
	ci->rcdev.ops = &ci_hdrc_msm_reset_ops;

	ci->rcdev.of_node = pdev->dev.of_node;

	ci->rcdev.nr_resets = 2;

	ret = reset_controller_register(&ci->rcdev);

	ret = devm_reset_controller_register(&pdev->dev, &ci->rcdev);

	if (ret)

		return ret;



	ret = clk_prepare_enable(ci->fs_clk);

	if (ret)

		goto err_fs;

		return ret;



	reset_control_assert(reset);

	usleep_range(10000, 12000);
@@ -232,7 +232,7 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) 


	ret = clk_prepare_enable(ci->core_clk);

	if (ret)

		goto err_fs;

		return ret;



	ret = clk_prepare_enable(ci->iface_clk);

	if (ret)
@@ -271,8 +271,6 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) 
	clk_disable_unprepare(ci->iface_clk);

err_iface:

	clk_disable_unprepare(ci->core_clk);

err_fs:

	reset_controller_unregister(&ci->rcdev);

	return ret;

}
@@ -284,7 +282,6 @@ static int ci_hdrc_msm_remove(struct platform_device *pdev) 
	ci_hdrc_remove_device(ci->ci);

	clk_disable_unprepare(ci->iface_clk);

	clk_disable_unprepare(ci->core_clk);

	reset_controller_unregister(&ci->rcdev);



	return 0;

}