thermal: tsens: checkpatch cleanup (3f63731b) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/thermal/msm-tsens.c

+35 −30

Original line number	Diff line number	Diff line
		@@ -871,13 +871,13 @@ static uint32_t get_tsens_sensor_for_client_id(struct tsens_tm_device *tmdev,
		if (!of_match_node(tsens_match, of_node)) {
		pr_err("Need to read SoC specific fuse map\n");
		return -ENODEV;
		} else {
		}

		id = of_match_node(tsens_match, of_node);
		if (id == NULL) {
		pr_err("can not find tsens_match of_node\n");
		return -ENODEV;
		}
		}

		if (!strcmp(id->compatible, "qcom,msm8996-tsens")) {
		while (i < tmdev->tsens_num_sensor && !id_found) {
		@@ -990,13 +990,13 @@ int tsens_get_hw_id_mapping(int sensor_sw_id, int *sensor_client_id)
		if (!of_match_node(tsens_match, of_node)) {
		pr_err("Need to read SoC specific fuse map\n");
		return -ENODEV;
		} else {
		}

		id = of_match_node(tsens_match, of_node);
		if (id == NULL) {
		pr_err("can not find tsens_match of_node\n");
		return -ENODEV;
		}
		}

		if (!strcmp(id->compatible, "qcom,msm8996-tsens")) {
		/* Assign a client id which will be used to get the
		@@ -2132,6 +2132,7 @@ static irqreturn_t tsens_tm_critical_irq_thread(int irq, void *data)

		if (critical_thr) {
		unsigned long temp;

		tsens_tz_get_temp(tm->sensor[i].tz_dev, &temp);
		rc = tsens_get_sw_id_mapping_for_controller(
		tm->sensor[i].sensor_hw_num,
		@@ -2282,8 +2283,8 @@ static irqreturn_t tsens_irq_thread(int irq, void *data)
		for (i = 0; i < tm->tsens_num_sensor; i++) {
		bool upper_thr = false, lower_thr = false;
		uint32_t addr_offset;
		sensor_sw_id = tm->sensor[i].sensor_sw_id;

		sensor_sw_id = tm->sensor[i].sensor_sw_id;
		addr_offset = tm->sensor[i].sensor_hw_num *
		TSENS_SN_ADDR_OFFSET;
		status = readl_relaxed(sensor_status_addr + addr_offset);
		@@ -2767,6 +2768,7 @@ static int tsens_calib_msm8909_sensors(struct tsens_tm_device *tmdev)

		for (i = 0; i < tmdev->tsens_num_sensor; i++) {
		int32_t num = 0, den = 0;

		tmdev->sensor[i].calib_data_point2 = calib_tsens_point2_data[i];
		tmdev->sensor[i].calib_data_point1 = calib_tsens_point1_data[i];
		pr_debug("sensor:%d - calib_data_point1:0x%x, calib_data_point2:0x%x\n",
		@@ -2934,6 +2936,7 @@ static int tsens_calib_8939_sensors(struct tsens_tm_device *tmdev)

		for (i = 0; i < tmdev->tsens_num_sensor; i++) {
		int32_t num = 0, den = 0;

		tmdev->sensor[i].calib_data_point2 = calib_tsens_point2_data[i];
		tmdev->sensor[i].calib_data_point1 = calib_tsens_point1_data[i];
		pr_debug("sensor:%d - calib_data_point1:0x%x, calib_data_point2:0x%x\n",
		@@ -3057,6 +3060,7 @@ static int tsens_calib_8916_sensors(struct tsens_tm_device *tmdev)

		for (i = 0; i < tmdev->tsens_num_sensor; i++) {
		int32_t num = 0, den = 0;

		tmdev->sensor[i].calib_data_point2 = calib_tsens_point2_data[i];
		tmdev->sensor[i].calib_data_point1 = calib_tsens_point1_data[i];
		pr_debug("sensor:%d - calib_data_point1:0x%x, calib_data_point2:0x%x\n",
		@@ -3135,6 +3139,7 @@ calibration_less_mode:
		compute_intercept_slope:
		for (i = 0; i < tmdev->tsens_num_sensor; i++) {
		int32_t num = 0, den = 0, adc_code_of_tempx = 0;

		tmdev->sensor[i].calib_data_point2 = tsens_base1_data;
		tmdev->sensor[i].calib_data_point1 = tsens_base0_data;
		pr_debug("sensor:%d - calib_data_point1:0x%x, calib_data_point2:0x%x\n",
		@@ -3377,6 +3382,7 @@ calibration_less_mode:

		for (i = 0; i < tmdev->tsens_num_sensor; i++) {
		int32_t num = 0, den = 0, adc_code_of_tempx = 0;

		tmdev->sensor[i].calib_data_point2 = tsens_base1_data;
		tmdev->sensor[i].calib_data_point1 = tsens_base0_data;
		pr_debug("sensor:%d - calib_data_point1:0x%x, calib_data_point2:0x%x\n",
		@@ -3604,6 +3610,7 @@ calibration_less_mode:

		for (i = 0; i < tmdev->tsens_num_sensor; i++) {
		int32_t num = 0, den = 0, adc_code_of_tempx = 0;

		tmdev->sensor[i].calib_data_point2 = tsens_base1_data;
		tmdev->sensor[i].calib_data_point1 = tsens_base0_data;
		pr_debug("sensor:%d - calib_data_point1:0x%x, calib_data_point2:0x%x\n",
		@@ -3718,6 +3725,7 @@ calibration_less_mode:
		compute_intercept_slope:
		for (i = 0; i < tmdev->tsens_num_sensor; i++) {
		int32_t num = 0, den = 0;

		tmdev->sensor[i].calib_data_point2 = calib_tsens_point2_data[i];
		tmdev->sensor[i].calib_data_point1 = calib_tsens_point1_data[i];
		pr_debug("sensor:%d - calib_data_point1:0x%x, calib_data_point2:0x%x\n",
		@@ -3874,6 +3882,7 @@ calibration_less_mode:
		compute_intercept_slope:
		for (i = 0; i < tmdev->tsens_num_sensor; i++) {
		int32_t num = 0, den = 0;

		tmdev->sensor[i].calib_data_point2 = calib_tsens_point2_data[i];
		tmdev->sensor[i].calib_data_point1 = calib_tsens_point1_data[i];
		pr_debug("sensor:%d - calib_data_point1:0x%x, calib_data_point2:0x%x\n",
		@@ -4207,6 +4216,7 @@ calibration_less_mode:
		compute_intercept_slope:
		for (i = 0; i < tmdev->tsens_num_sensor; i++) {
		int32_t num = 0, den = 0;

		tmdev->sensor[i].calib_data_point2 = calib_tsens_point2_data[i];
		tmdev->sensor[i].calib_data_point1 = calib_tsens_point1_data[i];
		pr_debug("sensor:%d - calib_data_point1:0x%x, calib_data_point2:0x%x\n",
		@@ -4479,6 +4489,7 @@ calibration_less_mode:
		compute_intercept_slope:
		for (i = 0; i < tmdev->tsens_num_sensor; i++) {
		int32_t num = 0, den = 0;

		tmdev->sensor[i].calib_data_point2 = calib_tsens_point2_data[i];
		tmdev->sensor[i].calib_data_point1 = calib_tsens_point1_data[i];
		pr_debug("sensor:%d - calib_data_point1:0x%x, calib_data_point2:0x%x\n",
		@@ -4555,6 +4566,7 @@ static int tsens_calib_msmzirc_sensors(struct tsens_tm_device *tmdev)

		for (i = 0; i < tmdev->tsens_num_sensor; i++) {
		int32_t num = 0, den = 0, adc_code_of_tempx = 0;

		tmdev->sensor[i].calib_data_point2 = tsens_base1_data;
		tmdev->sensor[i].calib_data_point1 = tsens_base0_data;
		pr_debug("sensor:%d - calib_data_point1:0x%x, calib_data_point2:0x%x\n",
		@@ -4650,10 +4662,8 @@ static int get_device_tree_data(struct platform_device *pdev,

		tsens_slope_data = devm_kzalloc(&pdev->dev,
		tsens_num_sensors * sizeof(u32), GFP_KERNEL);
		if (!tsens_slope_data) {
		dev_err(&pdev->dev, "can not allocate slope data\n");
		if (!tsens_slope_data)
		return -ENOMEM;
		}

		rc = of_property_read_u32_array(of_node,
		"qcom,slope", tsens_slope_data, tsens_num_sensors);
		@@ -4665,13 +4675,13 @@ static int get_device_tree_data(struct platform_device *pdev,
		if (!of_match_node(tsens_match, of_node)) {
		pr_err("Need to read SoC specific fuse map\n");
		return -ENODEV;
		} else {
		}

		id = of_match_node(tsens_match, of_node);
		if (id == NULL) {
		pr_err("can not find tsens_match of_node\n");
		return -ENODEV;
		}
		}

		for (i = 0; i < tsens_num_sensors; i++)
		tmdev->sensor[i].slope_mul_tsens_factor = tsens_slope_data[i];
		@@ -4685,17 +4695,13 @@ static int get_device_tree_data(struct platform_device *pdev,

		sensor_id = devm_kzalloc(&pdev->dev,
		tsens_num_sensors * sizeof(u32), GFP_KERNEL);
		if (!sensor_id) {
		dev_err(&pdev->dev, "can not allocate sensor id\n");
		if (!sensor_id)
		return -ENOMEM;
		}

		client_id = devm_kzalloc(&pdev->dev,
		tsens_num_sensors * sizeof(u32), GFP_KERNEL);
		if (!client_id) {
		dev_err(&pdev->dev, "can not allocate client id\n");
		if (!client_id)
		return -ENOMEM;
		}

		rc = of_property_read_u32_array(of_node,
		"qcom,client-id", client_id, tsens_num_sensors);
		@@ -4947,8 +4953,6 @@ static void tsens_debugfs_init(void)
		pr_err("Failed to create TSENS folder\n");
		return;
		}

		return;
		}

		int tsens_sensor_sw_idx = 0;
		@@ -4964,6 +4968,7 @@ static int tsens_thermal_zone_register(struct tsens_tm_device *tmdev)

		for (i = 0; i < tmdev->tsens_num_sensor; i++) {
		char name[18];

		snprintf(name, sizeof(name), "tsens_tz_sensor%d",
		tsens_sensor_sw_idx);
		tmdev->sensor[i].mode = THERMAL_DEVICE_ENABLED;

include/linux/msm_tsens.h

+46 −19

Original line number	Diff line number	Diff line
		@@ -18,43 +18,67 @@
		#ifndef __MSM_TSENS_H
		#define __MSM_TSENS_H

		enum platform_type {
		MSM_8660 = 0,
		MSM_8960,
		MDM_9615,
		APQ_8064,
		MSM_TYPE
		};

		#define TSENS_MAX_SENSORS 11
		#define TSENS_MTC_ZONE_LOG_SIZE 6
		#define TSENS_NUM_MTC_ZONES_SUPPORT 3
		#define TSENS_ZONEMASK_PARAMS 3
		#define TSENS_ZONELOG_PARAMS 1

		struct tsens_platform_data {
		int slope[TSENS_MAX_SENSORS];
		int tsens_factor;
		uint32_t tsens_num_sensor;
		enum platform_type hw_type;
		};

		struct tsens_device {
		uint32_t sensor_num;
		};

		int32_t tsens_get_temp(struct tsens_device dev, unsigned long temp);
		int msm_tsens_early_init(struct tsens_platform_data *pdata);

		#if defined(CONFIG_THERMAL_TSENS8974)
		/**
		* tsens_is_ready() - Clients can use this API to check if the TSENS device
		* is ready and clients can start requesting temperature reads.
		* @return: Returns true if device is ready else returns -EPROBE_DEFER
		* for clients to check back after a time duration.
		*/
		int tsens_is_ready(void);
		/**
		* tsens_tm_init_driver() - Early initialization for clients to read
		* TSENS temperature.
		*/
		int __init tsens_tm_init_driver(void);
		/**
		* tsens_get_hw_id_mapping() - Mapping software or sensor ID with the physical
		* TSENS sensor. On certain cases where there are more number of
		* controllers the sensor ID is used to map the clients software ID
		* with the physical HW sensors used by the driver.
		* @sensors_sw_id: Client ID.
		* @sensor_hw_num: Sensor client ID passed by the driver. This ID is used
		* by the driver to map it to the physical HW sensor
		* number.
		* @return: If the device is not present returns -EPROBE_DEFER
		* for clients to check back after a time duration.
		* 0 on success else error code on error.
		*/
		int tsens_get_hw_id_mapping(int sensor_sw_id, int *sensor_hw_num);
		/**
		* tsens_get_max_sensor_num() - Get the total number of active TSENS sensors.
		* The total number received by the client is across multiple
		* TSENS controllers if present.
		* @tsens_num_sensors: Total number of sensor result to be stored.
		*/
		int tsens_get_max_sensor_num(uint32_t *tsens_num_sensors);
		int tsens_set_mtc_zone_sw_mask(unsigned int zone , unsigned int th1_enable,
		unsigned int th2_enable);
		int tsens_get_mtc_zone_log(unsigned int zone , void *zone_log);
		int tsens_mtc_reset_history_counter(unsigned int zone);
		/**
		* tsens_get_temp() - Obtain the TSENS temperature for the respective sensor.
		*
		* @dev: Sensor number for which client wants the TSENS temperature
		* reading. The ID passed by the sensor could be the sensor ID
		* which the driver translates to internally to read the
		* respective physical HW sensor from the controller.
		* @temp: temperature result to be stored.
		* @return: If the device is not present returns -EPROBE_DEFER
		* for clients to check back after a time duration.
		* 0 on success else error code on error.
		*/
		int tsens_get_temp(struct tsens_device dev, unsigned long temp);
		#else
		static inline int tsens_is_ready(void)
		{ return -ENXIO; }
		@@ -73,6 +97,9 @@ static inline int tsens_get_mtc_zone_log(unsigned int zone , void *zone_log)
		{ return -ENXIO; }
		static inline int tsens_mtc_reset_history_counter(unsigned int zone)
		{ return -ENXIO; }
		static inline int tsens_get_temp(struct tsens_device *dev,
		unsigned long *temp)
		{ return -ENXIO; }
		#endif

		#endif /MSM_TSENS_H /