mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	hwmon: (sg2042) Use per-client debugfs entry
The I2C core now offers a debugfs-directory per client. Use it and remove the custom handling. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Link: https://lore.kernel.org/r/20250125123941.36729-12-wsa+renesas@sang-engineering.com Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
		
							parent
							
								
									2e522c2933
								
							
						
					
					
						commit
						cd4db38c43
					
				
					 1 changed files with 7 additions and 37 deletions
				
			
		| 
						 | 
					@ -50,12 +50,9 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct sg2042_mcu_data {
 | 
					struct sg2042_mcu_data {
 | 
				
			||||||
	struct i2c_client	*client;
 | 
						struct i2c_client	*client;
 | 
				
			||||||
	struct dentry		*debugfs;
 | 
					 | 
				
			||||||
	struct mutex		mutex;
 | 
						struct mutex		mutex;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static struct dentry *sgmcu_debugfs;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
static ssize_t reset_count_show(struct device *dev,
 | 
					static ssize_t reset_count_show(struct device *dev,
 | 
				
			||||||
				struct device_attribute *attr,
 | 
									struct device_attribute *attr,
 | 
				
			||||||
				char *buf)
 | 
									char *buf)
 | 
				
			||||||
| 
						 | 
					@ -292,18 +289,15 @@ static const struct hwmon_chip_info sg2042_mcu_chip_info = {
 | 
				
			||||||
	.info = sg2042_mcu_info,
 | 
						.info = sg2042_mcu_info,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void sg2042_mcu_debugfs_init(struct sg2042_mcu_data *mcu,
 | 
					static void sg2042_mcu_debugfs_init(struct sg2042_mcu_data *mcu)
 | 
				
			||||||
				    struct device *dev)
 | 
					 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	mcu->debugfs = debugfs_create_dir(dev_name(dev), sgmcu_debugfs);
 | 
						debugfs_create_file("firmware_version", 0444, mcu->client->debugfs,
 | 
				
			||||||
 | 
					 | 
				
			||||||
	debugfs_create_file("firmware_version", 0444, mcu->debugfs,
 | 
					 | 
				
			||||||
			    mcu, &firmware_version_fops);
 | 
								    mcu, &firmware_version_fops);
 | 
				
			||||||
	debugfs_create_file("pcb_version", 0444, mcu->debugfs, mcu,
 | 
						debugfs_create_file("pcb_version", 0444, mcu->client->debugfs, mcu,
 | 
				
			||||||
			    &pcb_version_fops);
 | 
								    &pcb_version_fops);
 | 
				
			||||||
	debugfs_create_file("mcu_type", 0444, mcu->debugfs, mcu,
 | 
						debugfs_create_file("mcu_type", 0444, mcu->client->debugfs, mcu,
 | 
				
			||||||
			    &mcu_type_fops);
 | 
								    &mcu_type_fops);
 | 
				
			||||||
	debugfs_create_file("board_type", 0444, mcu->debugfs, mcu,
 | 
						debugfs_create_file("board_type", 0444, mcu->client->debugfs, mcu,
 | 
				
			||||||
			    &board_type_fops);
 | 
								    &board_type_fops);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -333,18 +327,11 @@ static int sg2042_mcu_i2c_probe(struct i2c_client *client)
 | 
				
			||||||
	if (IS_ERR(hwmon_dev))
 | 
						if (IS_ERR(hwmon_dev))
 | 
				
			||||||
		return PTR_ERR(hwmon_dev);
 | 
							return PTR_ERR(hwmon_dev);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	sg2042_mcu_debugfs_init(mcu, dev);
 | 
						sg2042_mcu_debugfs_init(mcu);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return 0;
 | 
						return 0;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void sg2042_mcu_i2c_remove(struct i2c_client *client)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct sg2042_mcu_data *mcu = i2c_get_clientdata(client);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	debugfs_remove_recursive(mcu->debugfs);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
static const struct i2c_device_id sg2042_mcu_id[] = {
 | 
					static const struct i2c_device_id sg2042_mcu_id[] = {
 | 
				
			||||||
	{ "sg2042-hwmon-mcu" },
 | 
						{ "sg2042-hwmon-mcu" },
 | 
				
			||||||
	{ }
 | 
						{ }
 | 
				
			||||||
| 
						 | 
					@ -364,25 +351,8 @@ static struct i2c_driver sg2042_mcu_driver = {
 | 
				
			||||||
		.dev_groups = sg2042_mcu_groups,
 | 
							.dev_groups = sg2042_mcu_groups,
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
	.probe = sg2042_mcu_i2c_probe,
 | 
						.probe = sg2042_mcu_i2c_probe,
 | 
				
			||||||
	.remove = sg2042_mcu_i2c_remove,
 | 
					 | 
				
			||||||
	.id_table = sg2042_mcu_id,
 | 
						.id_table = sg2042_mcu_id,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					module_i2c_driver(sg2042_mcu_driver);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int __init sg2042_mcu_init(void)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	sgmcu_debugfs = debugfs_create_dir("sg2042-mcu", NULL);
 | 
					 | 
				
			||||||
	return i2c_add_driver(&sg2042_mcu_driver);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
static void __exit sg2042_mcu_exit(void)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	debugfs_remove_recursive(sgmcu_debugfs);
 | 
					 | 
				
			||||||
	i2c_del_driver(&sg2042_mcu_driver);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
module_init(sg2042_mcu_init);
 | 
					 | 
				
			||||||
module_exit(sg2042_mcu_exit);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
MODULE_AUTHOR("Inochi Amaoto <inochiama@outlook.com>");
 | 
					 | 
				
			||||||
MODULE_DESCRIPTION("MCU I2C driver for SG2042 soc platform");
 | 
					 | 
				
			||||||
MODULE_LICENSE("GPL");
 | 
					MODULE_LICENSE("GPL");
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue