Re: [PATCH] hwmon: (tmp108) Drop of_match_ptr() protection

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Dec 04, 2024 at 06:17:54AM -0800, Guenter Roeck wrote:
> Limiting the scope of devicetree support to CONFIG_OF prevents use of this
> driver with ACPI via PRP0001. Drop the dependency.
>
> While at it,
> - Switch of.h for mod_devicetable.h include given the use of struct
>   of_device_id which is defined in that header
> - Add I2C device ID for p3t1085
> - Drop the unnecessary include of hwmon-sysfs.h.
>
> Cc: Frank Li <Frank.Li@xxxxxxx>

Reviewed-by: Frank Li <Frank.Li@xxxxxxx>

> Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
>  drivers/hwmon/tmp108.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/hwmon/tmp108.c b/drivers/hwmon/tmp108.c
> index fbe673009126..8110601263bb 100644
> --- a/drivers/hwmon/tmp108.c
> +++ b/drivers/hwmon/tmp108.c
> @@ -8,10 +8,9 @@
>  #include <linux/device.h>
>  #include <linux/err.h>
>  #include <linux/hwmon.h>
> -#include <linux/hwmon-sysfs.h>
> +#include <linux/mod_devicetable.h>
>  #include <linux/module.h>
>  #include <linux/mutex.h>
> -#include <linux/of.h>
>  #include <linux/i2c.h>
>  #include <linux/i3c/device.h>
>  #include <linux/init.h>
> @@ -417,25 +416,24 @@ static int tmp108_resume(struct device *dev)
>  static DEFINE_SIMPLE_DEV_PM_OPS(tmp108_dev_pm_ops, tmp108_suspend, tmp108_resume);
>
>  static const struct i2c_device_id tmp108_i2c_ids[] = {
> +	{ "p3t1085" },
>  	{ "tmp108" },
>  	{ }
>  };
>  MODULE_DEVICE_TABLE(i2c, tmp108_i2c_ids);
>
> -#ifdef CONFIG_OF
>  static const struct of_device_id tmp108_of_ids[] = {
>  	{ .compatible = "nxp,p3t1085", },
>  	{ .compatible = "ti,tmp108", },
>  	{}
>  };
>  MODULE_DEVICE_TABLE(of, tmp108_of_ids);
> -#endif
>
>  static struct i2c_driver tmp108_driver = {
>  	.driver = {
>  		.name	= DRIVER_NAME,
>  		.pm	= pm_sleep_ptr(&tmp108_dev_pm_ops),
> -		.of_match_table = of_match_ptr(tmp108_of_ids),
> +		.of_match_table = tmp108_of_ids,
>  	},
>  	.probe		= tmp108_probe,
>  	.id_table	= tmp108_i2c_ids,
> --
> 2.45.2
>




[Index of Archives]     [LM Sensors]     [Linux Sound]     [ALSA Users]     [ALSA Devel]     [Linux Audio Users]     [Linux Media]     [Kernel]     [Gimp]     [Yosemite News]     [Linux Media]

  Powered by Linux