Merge "drivers: thermal: Update a variable type in QMI encode logic" (1affe01f) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/thermal/qcom/qmi_sensors.c

+10 −4

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
		* Copyright (c) 2018-2020,2021 The Linux Foundation. All rights reserved.
		*/

		#define pr_fmt(fmt) "%s:%s " fmt, KBUILD_MODNAME, __func__
		@@ -124,7 +124,7 @@ static char sensor_clients[QMI_TS_MAX_NR][QMI_CLIENT_NAME_LENGTH] = {
		static int32_t encode_qmi(int32_t val)
		{
		uint32_t shift = 0, local_val = 0;
		int32_t temp_val = 0;
		unsigned long temp_val = 0;

		if (val == INT_MAX \|\| val == INT_MIN)
		return 0;
		@@ -134,8 +134,7 @@ static int32_t encode_qmi(int32_t val)
		temp_val *= -1;
		local_val \|= 1 << QMI_FL_SIGN_BIT;
		}
		shift = find_last_bit((const unsigned long *)&temp_val,
		sizeof(temp_val) * 8);
		shift = find_last_bit(&temp_val, sizeof(temp_val) * 8);
		local_val \|= ((shift + 127) << QMI_MANTISSA_MSB);
		temp_val &= ~(1 << shift);

		@@ -279,6 +278,13 @@ static int qmi_ts_request(struct qmi_sensor *qmi_sens,
		qmi_sens->low_thresh != INT_MIN;
		req.temp_threshold_low =
		encode_qmi(qmi_sens->low_thresh);

		pr_debug("Sensor:%s set high_trip:%d, low_trip:%d, high_valid:%d, low_valid:%d\n",
		qmi_sens->qmi_name,
		qmi_sens->high_thresh,
		qmi_sens->low_thresh,
		req.temp_threshold_high_valid,
		req.temp_threshold_low_valid);
		}

		mutex_lock(&ts->mutex);