From bd7081ae2bbd063fa4a29a01cb7004d8516e54e3 Mon Sep 17 00:00:00 2001 From: Wu Fengguang Date: Wed, 29 Apr 2015 09:10:16 +0800 Subject: [PATCH] Thermal: Intel SoC: fix simple_return.cocci warnings drivers/thermal/intel_soc_dts_iosf.c:358:4-7: WARNING: end returns can be simpified Simplify a trivial if-return sequence. Possibly combine with a preceding function call. Generated by: scripts/coccinelle/misc/simple_return.cocci CC: Srinivas Pandruvada Signed-off-by: Fengguang Wu Signed-off-by: Zhang Rui --- drivers/thermal/intel_soc_dts_iosf.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/thermal/intel_soc_dts_iosf.c b/drivers/thermal/intel_soc_dts_iosf.c index d89787612c5d..42e4b6ac3875 100644 --- a/drivers/thermal/intel_soc_dts_iosf.c +++ b/drivers/thermal/intel_soc_dts_iosf.c @@ -350,18 +350,13 @@ int intel_soc_dts_iosf_add_read_only_critical_trip( struct intel_soc_dts_sensors *sensors, int critical_offset) { int i, j; - int ret; for (i = 0; i < SOC_MAX_DTS_SENSORS; ++i) { for (j = 0; j < sensors->soc_dts[i].trip_count; ++j) { if (!(sensors->soc_dts[i].trip_mask & BIT(j))) { - ret = update_trip_temp(&sensors->soc_dts[i], j, + return update_trip_temp(&sensors->soc_dts[i], j, sensors->tj_max - critical_offset, THERMAL_TRIP_CRITICAL); - if (ret) - return ret; - - return 0; } } } -- 2.34.1