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

Commit 79e093c3 authored by Amit Daniel Kachhap's avatar Amit Daniel Kachhap Committed by Zhang Rui
Browse files

thermal: exynos: Use devm_* functions 



devm_* functions are used to replace kzalloc, request_mem_region, ioremap
and request_irq functions in probe call. With the usage of devm_* functions
explicit freeing and unmapping is not required.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarSachin Kamat <sachin.kamat@samsung.com>
Signed-off-by: default avatarAmit Daniel Kachhap <amit.kachhap@linaro.org>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent 17be868e

drivers/thermal/exynos_thermal.c

+9 −36
Original line number Diff line number Diff line
@@ -842,7 +842,8 @@ static int __devinit exynos_tmu_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev, "No platform init data supplied.\n");

		return -ENODEV;

	}

	data = kzalloc(sizeof(struct exynos_tmu_data), GFP_KERNEL);

	data = devm_kzalloc(&pdev->dev, sizeof(struct exynos_tmu_data),

					GFP_KERNEL);

	if (!data) {

		dev_err(&pdev->dev, "Failed to allocate driver structure\n");

		return -ENOMEM;
@@ -850,47 +851,35 @@ static int __devinit exynos_tmu_probe(struct platform_device *pdev) 


	data->irq = platform_get_irq(pdev, 0);

	if (data->irq < 0) {

		ret = data->irq;

		dev_err(&pdev->dev, "Failed to get platform irq\n");

		goto err_free;

		return data->irq;

	}



	INIT_WORK(&data->irq_work, exynos_tmu_work);



	data->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!data->mem) {

		ret = -ENOENT;

		dev_err(&pdev->dev, "Failed to get platform resource\n");

		goto err_free;

		return -ENOENT;

	}



	data->mem = request_mem_region(data->mem->start,

			resource_size(data->mem), pdev->name);

	if (!data->mem) {

		ret = -ENODEV;

		dev_err(&pdev->dev, "Failed to request memory region\n");

		goto err_free;

	}



	data->base = ioremap(data->mem->start, resource_size(data->mem));

	data->base = devm_request_and_ioremap(&pdev->dev, data->mem);

	if (!data->base) {

		ret = -ENODEV;

		dev_err(&pdev->dev, "Failed to ioremap memory\n");

		goto err_mem_region;

		return -ENODEV;

	}



	ret = request_irq(data->irq, exynos_tmu_irq,

	ret = devm_request_irq(&pdev->dev, data->irq, exynos_tmu_irq,

		IRQF_TRIGGER_RISING, "exynos-tmu", data);

	if (ret) {

		dev_err(&pdev->dev, "Failed to request irq: %d\n", data->irq);

		goto err_io_remap;

		return ret;

	}



	data->clk = clk_get(NULL, "tmu_apbif");

	if (IS_ERR(data->clk)) {

		ret = PTR_ERR(data->clk);

		dev_err(&pdev->dev, "Failed to get clock\n");

		goto err_irq;

		return  PTR_ERR(data->clk);

	}



	if (pdata->type == SOC_ARCH_EXYNOS ||
@@ -942,15 +931,6 @@ static int __devinit exynos_tmu_probe(struct platform_device *pdev) 
err_clk:

	platform_set_drvdata(pdev, NULL);

	clk_put(data->clk);

err_irq:

	free_irq(data->irq, data);

err_io_remap:

	iounmap(data->base);

err_mem_region:

	release_mem_region(data->mem->start, resource_size(data->mem));

err_free:

	kfree(data);



	return ret;

}
@@ -964,15 +944,8 @@ static int __devexit exynos_tmu_remove(struct platform_device *pdev) 


	clk_put(data->clk);



	free_irq(data->irq, data);



	iounmap(data->base);

	release_mem_region(data->mem->start, resource_size(data->mem));



	platform_set_drvdata(pdev, NULL);



	kfree(data);



	return 0;

}