drivers: thermal: tsens: Merge tsens-common.c into tsens.c (a7ff8297) · Commits · 戴 / test

tsens-common.c has outlived its usefuless. It was created expecting lots of custom routines per version of the TSENS IP. We haven't needed those, there is now only data in the version-specific files. Merge the code for tsens-common.c into tsens.c. As a result, - Remove any unnecessary forward declarations in tsens.h. - Add a Linaro copyright to tsens.c. - Fixup the Makefile to remove tsens-common.c. - Where it made sense, fix some 80-column alignments in the tsens-common.c code being copied over. There is no functional change with this patch. Signed-off-by:

Amit Kucheria <amit.kucheria@linaro.org> Reviewed-by:

Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by:

Daniel Lezcano <daniel.lezcano@linaro.org> Link: https://lore.kernel.org/r/e30e2ba6fa5c007983afd4d7d4e0311c0b57917a.1588183879.git.amit.kucheria@linaro.org

drivers/thermal/qcom/Makefile

+2 −2

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only
		obj-$(CONFIG_QCOM_TSENS) += qcom_tsens.o

		qcom_tsens-y += tsens.o tsens-common.o tsens-v0_1.o \
		tsens-8960.o tsens-v2.o tsens-v1.o
		qcom_tsens-y += tsens.o tsens-v2.o tsens-v1.o tsens-v0_1.o \
		tsens-8960.o
		obj-$(CONFIG_QCOM_SPMI_TEMP_ALARM) += qcom-spmi-temp-alarm.o

drivers/thermal/qcom/tsens-common.c

deleted100644 → 0

+0 −843

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/thermal/qcom/tsens.c

+838 −0

File changed.

Preview size limit exceeded, changes collapsed.

drivers/thermal/qcom/tsens.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -580,11 +580,6 @@ void compute_intercept_slope(struct tsens_priv priv, u32 pt1, u32 *pt2, u32 mo
		int init_common(struct tsens_priv *priv);
		int get_temp_tsens_valid(const struct tsens_sensor s, int temp);
		int get_temp_common(const struct tsens_sensor s, int temp);
		int tsens_enable_irq(struct tsens_priv *priv);
		void tsens_disable_irq(struct tsens_priv *priv);
		int tsens_set_trips(void *_sensor, int low, int high);
		irqreturn_t tsens_irq_thread(int irq, void *data);
		irqreturn_t tsens_critical_irq_thread(int irq, void *data);

		/* TSENS target */
		extern struct tsens_plat_data data_8960;

Admin message