Commit d6cb9ab4 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Herbert Xu
Browse files

crypto: mxs-dcp - Use the devm_clk_get_optional_enabled() helper 



Use devm_clk_get_optional_enabled() instead of hand writing it.
This saves some loC and improves the semantic.

update the error handling path and the remove function accordingly.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 75120ef3

drivers/crypto/mxs-dcp.c

+5 −16
Original line number Original line Diff line number Diff line
@@ -1022,21 +1022,15 @@ static int mxs_dcp_probe(struct platform_device *pdev) 
	sdcp->coh = PTR_ALIGN(sdcp->coh, DCP_ALIGNMENT);

	sdcp->coh = PTR_ALIGN(sdcp->coh, DCP_ALIGNMENT);





	/* DCP clock is optional, only used on some SOCs */

	/* DCP clock is optional, only used on some SOCs */

	sdcp->dcp_clk = devm_clk_get(dev, "dcp");

	sdcp->dcp_clk = devm_clk_get_optional_enabled(dev, "dcp");

	if (IS_ERR(sdcp->dcp_clk)) {

	if (IS_ERR(sdcp->dcp_clk))

		if (sdcp->dcp_clk != ERR_PTR(-ENOENT))

		return PTR_ERR(sdcp->dcp_clk);

		return PTR_ERR(sdcp->dcp_clk);

		sdcp->dcp_clk = NULL;

	}

	ret = clk_prepare_enable(sdcp->dcp_clk);

	if (ret)

		return ret;





	/* Restart the DCP block. */

	/* Restart the DCP block. */

	ret = stmp_reset_block(sdcp->base);

	ret = stmp_reset_block(sdcp->base);

	if (ret) {

	if (ret) {

		dev_err(dev, "Failed reset\n");

		dev_err(dev, "Failed reset\n");

		goto err_disable_unprepare_clk;

		return ret;

	}

	}





	/* Initialize control register. */

	/* Initialize control register. */
@@ -1076,7 +1070,7 @@ static int mxs_dcp_probe(struct platform_device *pdev) 
	if (IS_ERR(sdcp->thread[DCP_CHAN_HASH_SHA])) {

	if (IS_ERR(sdcp->thread[DCP_CHAN_HASH_SHA])) {

		dev_err(dev, "Error starting SHA thread!\n");

		dev_err(dev, "Error starting SHA thread!\n");

		ret = PTR_ERR(sdcp->thread[DCP_CHAN_HASH_SHA]);

		ret = PTR_ERR(sdcp->thread[DCP_CHAN_HASH_SHA]);

		goto err_disable_unprepare_clk;

		return ret;

	}

	}





	sdcp->thread[DCP_CHAN_CRYPTO] = kthread_run(dcp_chan_thread_aes,

	sdcp->thread[DCP_CHAN_CRYPTO] = kthread_run(dcp_chan_thread_aes,
@@ -1134,9 +1128,6 @@ static int mxs_dcp_probe(struct platform_device *pdev) 
err_destroy_sha_thread:

err_destroy_sha_thread:

	kthread_stop(sdcp->thread[DCP_CHAN_HASH_SHA]);

	kthread_stop(sdcp->thread[DCP_CHAN_HASH_SHA]);





err_disable_unprepare_clk:

	clk_disable_unprepare(sdcp->dcp_clk);



	return ret;

	return ret;

}

}
@@ -1156,8 +1147,6 @@ static int mxs_dcp_remove(struct platform_device *pdev) 
	kthread_stop(sdcp->thread[DCP_CHAN_HASH_SHA]);

	kthread_stop(sdcp->thread[DCP_CHAN_HASH_SHA]);

	kthread_stop(sdcp->thread[DCP_CHAN_CRYPTO]);

	kthread_stop(sdcp->thread[DCP_CHAN_CRYPTO]);





	clk_disable_unprepare(sdcp->dcp_clk);



	platform_set_drvdata(pdev, NULL);

	platform_set_drvdata(pdev, NULL);





	global_sdcp = NULL;

	global_sdcp = NULL;