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

Commit c312a53c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "crypto: msm: remove wakeup lock in qcrypto driver"

parents a4b72215 18665dab

drivers/crypto/msm/qcrypto.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -478,7 +478,6 @@ static void qcrypto_ce_set_bus(struct crypto_engine *pengine, 
	int ret = 0;

	int ret = 0;





	if (high_bw_req) {

	if (high_bw_req) {

		pm_stay_awake(&pengine->pdev->dev);

		ret = qce_enable_clk(pengine->qce);

		ret = qce_enable_clk(pengine->qce);

		if (ret) {

		if (ret) {

			pr_err("%s Unable enable clk\n", __func__);

			pr_err("%s Unable enable clk\n", __func__);
@@ -492,10 +491,7 @@ static void qcrypto_ce_set_bus(struct crypto_engine *pengine, 
			qce_disable_clk(pengine->qce);

			qce_disable_clk(pengine->qce);

			goto clk_err;

			goto clk_err;

		}

		}





	} else {

	} else {



		ret = msm_bus_scale_client_update_request(

		ret = msm_bus_scale_client_update_request(

				pengine->bus_scale_handle, 0);

				pengine->bus_scale_handle, 0);

		if (ret) {

		if (ret) {
@@ -513,11 +509,8 @@ static void qcrypto_ce_set_bus(struct crypto_engine *pengine, 
						__func__);

						__func__);

			goto clk_err;

			goto clk_err;

		}

		}

		pm_relax(&pengine->pdev->dev);

	}

	}

	return;

clk_err:

clk_err:

	pm_relax(&pengine->pdev->dev);

	return;

	return;





}

}
@@ -1078,7 +1071,6 @@ static void _qcrypto_remove_engine(struct crypto_engine *pengine) 
	cancel_work_sync(&pengine->bw_reaper_ws);

	cancel_work_sync(&pengine->bw_reaper_ws);

	cancel_work_sync(&pengine->bw_allocate_ws);

	cancel_work_sync(&pengine->bw_allocate_ws);

	del_timer_sync(&pengine->bw_reaper_timer);

	del_timer_sync(&pengine->bw_reaper_timer);

	device_init_wakeup(&pengine->pdev->dev, false);





	if (pengine->bus_scale_handle != 0)

	if (pengine->bus_scale_handle != 0)

		msm_bus_scale_unregister_client(pengine->bus_scale_handle);

		msm_bus_scale_unregister_client(pengine->bus_scale_handle);
@@ -4615,7 +4607,6 @@ static int _qcrypto_probe(struct platform_device *pdev) 
	pengine->active_seq = 0;

	pengine->active_seq = 0;

	pengine->last_active_seq = 0;

	pengine->last_active_seq = 0;

	pengine->check_flag = false;

	pengine->check_flag = false;

	device_init_wakeup(&pengine->pdev->dev, true);





	crypto_init_queue(&pengine->req_queue, MSM_QCRYPTO_REQ_QUEUE_LENGTH);

	crypto_init_queue(&pengine->req_queue, MSM_QCRYPTO_REQ_QUEUE_LENGTH);