Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 14:43:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

thermal/drivers/exynos: Simplify probe() with local dev variable

Browse Source 
Simplify the probe() function by using local 'dev' instead of
&pdev->dev.  While touching devm_kzalloc(), use preferred sizeof(*)
syntax.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
Link: https://lore.kernel.org/r/20240709-thermal-probe-v1-4-241644e2b6e0@linaro.org
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
This commit is contained in:
Krzysztof Kozlowski 2024-07-09 14:59:34 +02:00 committed by Daniel Lezcano
parent 9d55cb3ba3
commit 4a6cf76edf
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/thermal/samsung/exynos_tmu.c
View File

@ -1004,11 +1004,11 @@ static const struct thermal_zone_device_ops exynos_sensor_ops = {
static int exynos_tmu_probe(struct platform_device *pdev) static int exynos_tmu_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev;
struct exynos_tmu_data *data; struct exynos_tmu_data *data;
int ret; int ret;
data = devm_kzalloc(&pdev->dev, sizeof(struct exynos_tmu_data), data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
GFP_KERNEL);
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
@ -1020,7 +1020,7 @@ static int exynos_tmu_probe(struct platform_device *pdev)
* TODO: Add regulator as an SOC feature, so that regulator enable * TODO: Add regulator as an SOC feature, so that regulator enable
* is a compulsory call. * is a compulsory call.
*/ */
ret = devm_regulator_get_enable_optional(&pdev->dev, "vtmu"); ret = devm_regulator_get_enable_optional(dev, "vtmu");
switch (ret) { switch (ret) {
case 0: case 0:
case -ENODEV: case -ENODEV:
@ -1028,8 +1028,7 @@ static int exynos_tmu_probe(struct platform_device *pdev)
case -EPROBE_DEFER: case -EPROBE_DEFER:
return -EPROBE_DEFER; return -EPROBE_DEFER;
default: default:
dev_err(&pdev->dev, "Failed to get enabled regulator: %d\n", dev_err(dev, "Failed to get enabled regulator: %d\n", ret);
ret);
return ret; return ret;
} }
@ -1037,44 +1036,44 @@ static int exynos_tmu_probe(struct platform_device *pdev)
if (ret) if (ret)
return ret; return ret;
data->clk = devm_clk_get(&pdev->dev, "tmu_apbif"); data->clk = devm_clk_get(dev, "tmu_apbif");
if (IS_ERR(data->clk)) { if (IS_ERR(data->clk)) {
dev_err(&pdev->dev, "Failed to get clock\n"); dev_err(dev, "Failed to get clock\n");
return PTR_ERR(data->clk); return PTR_ERR(data->clk);
} }
data->clk_sec = devm_clk_get(&pdev->dev, "tmu_triminfo_apbif"); data->clk_sec = devm_clk_get(dev, "tmu_triminfo_apbif");
if (IS_ERR(data->clk_sec)) { if (IS_ERR(data->clk_sec)) {
if (data->soc == SOC_ARCH_EXYNOS5420_TRIMINFO) { if (data->soc == SOC_ARCH_EXYNOS5420_TRIMINFO) {
dev_err(&pdev->dev, "Failed to get triminfo clock\n"); dev_err(dev, "Failed to get triminfo clock\n");
return PTR_ERR(data->clk_sec); return PTR_ERR(data->clk_sec);
} }
} else { } else {
ret = clk_prepare(data->clk_sec); ret = clk_prepare(data->clk_sec);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to get clock\n"); dev_err(dev, "Failed to get clock\n");
return ret; return ret;
} }
} }
ret = clk_prepare(data->clk); ret = clk_prepare(data->clk);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to get clock\n"); dev_err(dev, "Failed to get clock\n");
goto err_clk_sec; goto err_clk_sec;
} }
switch (data->soc) { switch (data->soc) {
case SOC_ARCH_EXYNOS5433: case SOC_ARCH_EXYNOS5433:
case SOC_ARCH_EXYNOS7: case SOC_ARCH_EXYNOS7:
data->sclk = devm_clk_get(&pdev->dev, "tmu_sclk"); data->sclk = devm_clk_get(dev, "tmu_sclk");
if (IS_ERR(data->sclk)) { if (IS_ERR(data->sclk)) {
dev_err(&pdev->dev, "Failed to get sclk\n"); dev_err(dev, "Failed to get sclk\n");
ret = PTR_ERR(data->sclk); ret = PTR_ERR(data->sclk);
goto err_clk; goto err_clk;
} else { } else {
ret = clk_prepare_enable(data->sclk); ret = clk_prepare_enable(data->sclk);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to enable sclk\n"); dev_err(dev, "Failed to enable sclk\n");
goto err_clk; goto err_clk;
} }
} }
@ -1085,33 +1084,32 @@ static int exynos_tmu_probe(struct platform_device *pdev)
ret = exynos_tmu_initialize(pdev); ret = exynos_tmu_initialize(pdev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to initialize TMU\n"); dev_err(dev, "Failed to initialize TMU\n");
goto err_sclk; goto err_sclk;
} }
data->tzd = devm_thermal_of_zone_register(&pdev->dev, 0, data, data->tzd = devm_thermal_of_zone_register(dev, 0, data,
&exynos_sensor_ops); &exynos_sensor_ops);
if (IS_ERR(data->tzd)) { if (IS_ERR(data->tzd)) {
ret = PTR_ERR(data->tzd); ret = PTR_ERR(data->tzd);
if (ret != -EPROBE_DEFER) if (ret != -EPROBE_DEFER)
dev_err(&pdev->dev, "Failed to register sensor: %d\n", dev_err(dev, "Failed to register sensor: %d\n", ret);
ret);
goto err_sclk; goto err_sclk;
} }
ret = exynos_thermal_zone_configure(pdev); ret = exynos_thermal_zone_configure(pdev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to configure the thermal zone\n"); dev_err(dev, "Failed to configure the thermal zone\n");
goto err_sclk; goto err_sclk;
} }
ret = devm_request_threaded_irq(&pdev->dev, data->irq, NULL, ret = devm_request_threaded_irq(dev, data->irq, NULL,
exynos_tmu_threaded_irq, exynos_tmu_threaded_irq,
IRQF_TRIGGER_RISING IRQF_TRIGGER_RISING
| IRQF_SHARED | IRQF_ONESHOT, | IRQF_SHARED | IRQF_ONESHOT,
dev_name(&pdev->dev), data); dev_name(dev), data);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to request irq: %d\n", data->irq); dev_err(dev, "Failed to request irq: %d\n", data->irq);
goto err_sclk; goto err_sclk;
} }