Commit 9f448e79 authored by Linus Walleij's avatar Linus Walleij Committed by Guenter Roeck
Browse files

hwmon: (ntc_thermistor) Move DT matches to the driver block 



This moves the device tree match data toward the end of the
driver which is the convention, here we can also add ACPI
and similar match data in a conforming manner.

Cc: Peter Rosin <peda@axentia.se>
Cc: Chris Lesiak <chris.lesiak@licor.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20211205235948.4167075-3-linus.walleij@linaro.org


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 70760e80

drivers/hwmon/ntc_thermistor.c

+35 −35
Original line number Diff line number Diff line
@@ -368,41 +368,6 @@ static int ntc_adc_iio_read(struct ntc_data *data) 
	return uv;

}



static const struct of_device_id ntc_match[] = {

	{ .compatible = "epcos,b57330v2103",

		.data = &ntc_thermistor_id[NTC_B57330V2103]},

	{ .compatible = "epcos,b57891s0103",

		.data = &ntc_thermistor_id[NTC_B57891S0103] },

	{ .compatible = "murata,ncp03wb473",

		.data = &ntc_thermistor_id[NTC_NCP03WB473] },

	{ .compatible = "murata,ncp03wf104",

		.data = &ntc_thermistor_id[NTC_NCP03WF104] },

	{ .compatible = "murata,ncp15wb473",

		.data = &ntc_thermistor_id[NTC_NCP15WB473] },

	{ .compatible = "murata,ncp15wl333",

		.data = &ntc_thermistor_id[NTC_NCP15WL333] },

	{ .compatible = "murata,ncp15xh103",

		.data = &ntc_thermistor_id[NTC_NCP15XH103] },

	{ .compatible = "murata,ncp18wb473",

		.data = &ntc_thermistor_id[NTC_NCP18WB473] },

	{ .compatible = "murata,ncp21wb473",

		.data = &ntc_thermistor_id[NTC_NCP21WB473] },



	/* Usage of vendor name "ntc" is deprecated */

	{ .compatible = "ntc,ncp03wb473",

		.data = &ntc_thermistor_id[NTC_NCP03WB473] },

	{ .compatible = "ntc,ncp15wb473",

		.data = &ntc_thermistor_id[NTC_NCP15WB473] },

	{ .compatible = "ntc,ncp15wl333",

		.data = &ntc_thermistor_id[NTC_NCP15WL333] },

	{ .compatible = "ntc,ncp18wb473",

		.data = &ntc_thermistor_id[NTC_NCP18WB473] },

	{ .compatible = "ntc,ncp21wb473",

		.data = &ntc_thermistor_id[NTC_NCP21WB473] },

	{ },

};

MODULE_DEVICE_TABLE(of, ntc_match);



static inline u64 div64_u64_safe(u64 dividend, u64 divisor)

{

	if (divisor == 0 && dividend == 0)
@@ -687,6 +652,41 @@ static int ntc_thermistor_probe(struct platform_device *pdev) 
	return 0;

}



static const struct of_device_id ntc_match[] = {

	{ .compatible = "epcos,b57330v2103",

		.data = &ntc_thermistor_id[NTC_B57330V2103]},

	{ .compatible = "epcos,b57891s0103",

		.data = &ntc_thermistor_id[NTC_B57891S0103] },

	{ .compatible = "murata,ncp03wb473",

		.data = &ntc_thermistor_id[NTC_NCP03WB473] },

	{ .compatible = "murata,ncp03wf104",

		.data = &ntc_thermistor_id[NTC_NCP03WF104] },

	{ .compatible = "murata,ncp15wb473",

		.data = &ntc_thermistor_id[NTC_NCP15WB473] },

	{ .compatible = "murata,ncp15wl333",

		.data = &ntc_thermistor_id[NTC_NCP15WL333] },

	{ .compatible = "murata,ncp15xh103",

		.data = &ntc_thermistor_id[NTC_NCP15XH103] },

	{ .compatible = "murata,ncp18wb473",

		.data = &ntc_thermistor_id[NTC_NCP18WB473] },

	{ .compatible = "murata,ncp21wb473",

		.data = &ntc_thermistor_id[NTC_NCP21WB473] },



	/* Usage of vendor name "ntc" is deprecated */

	{ .compatible = "ntc,ncp03wb473",

		.data = &ntc_thermistor_id[NTC_NCP03WB473] },

	{ .compatible = "ntc,ncp15wb473",

		.data = &ntc_thermistor_id[NTC_NCP15WB473] },

	{ .compatible = "ntc,ncp15wl333",

		.data = &ntc_thermistor_id[NTC_NCP15WL333] },

	{ .compatible = "ntc,ncp18wb473",

		.data = &ntc_thermistor_id[NTC_NCP18WB473] },

	{ .compatible = "ntc,ncp21wb473",

		.data = &ntc_thermistor_id[NTC_NCP21WB473] },

	{ },

};

MODULE_DEVICE_TABLE(of, ntc_match);



static struct platform_driver ntc_thermistor_driver = {

	.driver = {

		.name = "ntc-thermistor",