]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Thermal: Intel SoC: fix simple_return.cocci warnings
authorWu Fengguang <fengguang.wu@intel.com>
Wed, 29 Apr 2015 01:10:16 +0000 (09:10 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 1 May 2015 03:38:27 +0000 (11:38 +0800)
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 <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
drivers/thermal/intel_soc_dts_iosf.c

index d89787612c5d8a515f591f5b35178cc5c4feee9f..42e4b6ac38750fd97474637550caafbbf872db04 100644 (file)
@@ -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;
                        }
                }
        }