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

Commit 2de4dfb7 authored by Rama Krishna Phani A's avatar Rama Krishna Phani A Committed by Matt Wagantall
Browse files

thermal: tsens: Delete request_mem_region api in tsens 



Memory region conflict is being observed in efuse region
between tsens and cpu clock scaling driver. Removing the api
that resulting in conflict.

Change-Id: I24f8aded524dfe496ac4c193f7411ef9e6869743
Signed-off-by: default avatarRama Krishna Phani A <rphani@codeaurora.org>
parent c81a502a

drivers/thermal/msm-tsens.c

+2 −23
Original line number Diff line number Diff line
@@ -3920,28 +3920,16 @@ static int get_device_tree_data(struct platform_device *pdev, 
	tmdev->calib_len = tmdev->res_calib_mem->end -

					tmdev->res_calib_mem->start + 1;



	res_mem = request_mem_region(tmdev->res_calib_mem->start,

				tmdev->calib_len, tmdev->res_calib_mem->name);

	if (!res_mem) {

		pr_err("Request calibration memory region failed\n");

		rc = -EINVAL;

		goto fail_unmap_tsens;

	}



	tmdev->tsens_calib_addr = ioremap(res_mem->start,

	tmdev->tsens_calib_addr = ioremap(tmdev->res_calib_mem->start,

						tmdev->calib_len);

	if (!tmdev->tsens_calib_addr) {

		pr_err("Failed to IO map EEPROM registers.\n");

		rc = -EINVAL;

		goto fail_unmap_calib_region;

		goto fail_unmap_tsens;

	}



	return 0;



fail_unmap_calib_region:

	if (tmdev->res_calib_mem)

		release_mem_region(tmdev->res_calib_mem->start,

					tmdev->calib_len);

fail_unmap_tsens:

	if (tmdev->tsens_addr)

		iounmap(tmdev->tsens_addr);
@@ -4018,9 +4006,6 @@ fail: 
		destroy_workqueue(tmdev->tsens_critical_wq);

	if (tmdev->tsens_calib_addr)

		iounmap(tmdev->tsens_calib_addr);

	if (tmdev->res_calib_mem)

		release_mem_region(tmdev->res_calib_mem->start,

					tmdev->calib_len);

	if (tmdev->tsens_addr)

		iounmap(tmdev->tsens_addr);

	if (tmdev->res_tsens_mem)
@@ -4168,9 +4153,6 @@ static int tsens_thermal_zone_register(struct tsens_tm_device *tmdev) 
fail:

	if (tmdev->tsens_calib_addr)

		iounmap(tmdev->tsens_calib_addr);

	if (tmdev->res_calib_mem)

		release_mem_region(tmdev->res_calib_mem->start,

					tmdev->calib_len);

	if (tmdev->tsens_addr)

		iounmap(tmdev->tsens_addr);

	if (tmdev->res_tsens_mem)
@@ -4211,9 +4193,6 @@ static int tsens_tm_remove(struct platform_device *pdev) 
		thermal_zone_device_unregister(tmdev->sensor[i].tz_dev);

	if (tmdev->tsens_calib_addr)

		iounmap(tmdev->tsens_calib_addr);

	if (tmdev->res_calib_mem)

		release_mem_region(tmdev->res_calib_mem->start,

					tmdev->calib_len);

	if (tmdev->tsens_addr)

		iounmap(tmdev->tsens_addr);

	if (tmdev->res_tsens_mem)