Skip to content

Commit 4a6cf76

Browse files
krzkdlezcano
authored andcommitted
thermal/drivers/exynos: Simplify probe() with local dev variable
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 <[email protected]> Reviewed-by: Alim Akhtar <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Daniel Lezcano <[email protected]>
1 parent 9d55cb3 commit 4a6cf76

File tree

1 file changed

+20
-22
lines changed

1 file changed

+20
-22
lines changed

drivers/thermal/samsung/exynos_tmu.c

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,11 +1004,11 @@ static const struct thermal_zone_device_ops exynos_sensor_ops = {
10041004

10051005
static int exynos_tmu_probe(struct platform_device *pdev)
10061006
{
1007+
struct device *dev = &pdev->dev;
10071008
struct exynos_tmu_data *data;
10081009
int ret;
10091010

1010-
data = devm_kzalloc(&pdev->dev, sizeof(struct exynos_tmu_data),
1011-
GFP_KERNEL);
1011+
data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
10121012
if (!data)
10131013
return -ENOMEM;
10141014

@@ -1020,61 +1020,60 @@ static int exynos_tmu_probe(struct platform_device *pdev)
10201020
* TODO: Add regulator as an SOC feature, so that regulator enable
10211021
* is a compulsory call.
10221022
*/
1023-
ret = devm_regulator_get_enable_optional(&pdev->dev, "vtmu");
1023+
ret = devm_regulator_get_enable_optional(dev, "vtmu");
10241024
switch (ret) {
10251025
case 0:
10261026
case -ENODEV:
10271027
break;
10281028
case -EPROBE_DEFER:
10291029
return -EPROBE_DEFER;
10301030
default:
1031-
dev_err(&pdev->dev, "Failed to get enabled regulator: %d\n",
1032-
ret);
1031+
dev_err(dev, "Failed to get enabled regulator: %d\n", ret);
10331032
return ret;
10341033
}
10351034

10361035
ret = exynos_map_dt_data(pdev);
10371036
if (ret)
10381037
return ret;
10391038

1040-
data->clk = devm_clk_get(&pdev->dev, "tmu_apbif");
1039+
data->clk = devm_clk_get(dev, "tmu_apbif");
10411040
if (IS_ERR(data->clk)) {
1042-
dev_err(&pdev->dev, "Failed to get clock\n");
1041+
dev_err(dev, "Failed to get clock\n");
10431042
return PTR_ERR(data->clk);
10441043
}
10451044

1046-
data->clk_sec = devm_clk_get(&pdev->dev, "tmu_triminfo_apbif");
1045+
data->clk_sec = devm_clk_get(dev, "tmu_triminfo_apbif");
10471046
if (IS_ERR(data->clk_sec)) {
10481047
if (data->soc == SOC_ARCH_EXYNOS5420_TRIMINFO) {
1049-
dev_err(&pdev->dev, "Failed to get triminfo clock\n");
1048+
dev_err(dev, "Failed to get triminfo clock\n");
10501049
return PTR_ERR(data->clk_sec);
10511050
}
10521051
} else {
10531052
ret = clk_prepare(data->clk_sec);
10541053
if (ret) {
1055-
dev_err(&pdev->dev, "Failed to get clock\n");
1054+
dev_err(dev, "Failed to get clock\n");
10561055
return ret;
10571056
}
10581057
}
10591058

10601059
ret = clk_prepare(data->clk);
10611060
if (ret) {
1062-
dev_err(&pdev->dev, "Failed to get clock\n");
1061+
dev_err(dev, "Failed to get clock\n");
10631062
goto err_clk_sec;
10641063
}
10651064

10661065
switch (data->soc) {
10671066
case SOC_ARCH_EXYNOS5433:
10681067
case SOC_ARCH_EXYNOS7:
1069-
data->sclk = devm_clk_get(&pdev->dev, "tmu_sclk");
1068+
data->sclk = devm_clk_get(dev, "tmu_sclk");
10701069
if (IS_ERR(data->sclk)) {
1071-
dev_err(&pdev->dev, "Failed to get sclk\n");
1070+
dev_err(dev, "Failed to get sclk\n");
10721071
ret = PTR_ERR(data->sclk);
10731072
goto err_clk;
10741073
} else {
10751074
ret = clk_prepare_enable(data->sclk);
10761075
if (ret) {
1077-
dev_err(&pdev->dev, "Failed to enable sclk\n");
1076+
dev_err(dev, "Failed to enable sclk\n");
10781077
goto err_clk;
10791078
}
10801079
}
@@ -1085,33 +1084,32 @@ static int exynos_tmu_probe(struct platform_device *pdev)
10851084

10861085
ret = exynos_tmu_initialize(pdev);
10871086
if (ret) {
1088-
dev_err(&pdev->dev, "Failed to initialize TMU\n");
1087+
dev_err(dev, "Failed to initialize TMU\n");
10891088
goto err_sclk;
10901089
}
10911090

1092-
data->tzd = devm_thermal_of_zone_register(&pdev->dev, 0, data,
1091+
data->tzd = devm_thermal_of_zone_register(dev, 0, data,
10931092
&exynos_sensor_ops);
10941093
if (IS_ERR(data->tzd)) {
10951094
ret = PTR_ERR(data->tzd);
10961095
if (ret != -EPROBE_DEFER)
1097-
dev_err(&pdev->dev, "Failed to register sensor: %d\n",
1098-
ret);
1096+
dev_err(dev, "Failed to register sensor: %d\n", ret);
10991097
goto err_sclk;
11001098
}
11011099

11021100
ret = exynos_thermal_zone_configure(pdev);
11031101
if (ret) {
1104-
dev_err(&pdev->dev, "Failed to configure the thermal zone\n");
1102+
dev_err(dev, "Failed to configure the thermal zone\n");
11051103
goto err_sclk;
11061104
}
11071105

1108-
ret = devm_request_threaded_irq(&pdev->dev, data->irq, NULL,
1106+
ret = devm_request_threaded_irq(dev, data->irq, NULL,
11091107
exynos_tmu_threaded_irq,
11101108
IRQF_TRIGGER_RISING
11111109
| IRQF_SHARED | IRQF_ONESHOT,
1112-
dev_name(&pdev->dev), data);
1110+
dev_name(dev), data);
11131111
if (ret) {
1114-
dev_err(&pdev->dev, "Failed to request irq: %d\n", data->irq);
1112+
dev_err(dev, "Failed to request irq: %d\n", data->irq);
11151113
goto err_sclk;
11161114
}
11171115

0 commit comments

Comments
 (0)