[RFT,3/6] hwmon: (pt5161l) Use per-client debugfs entry

Commit Message

Wolfram Sang Jan. 25, 2025, 12:39 p.m. UTC

The I2C core now offers a debugfs-directory per client. Use it and
remove the custom handling.

Signed-off-by: Wolfram Sang <[e-mail]>
---
 drivers/hwmon/pt5161l.c | 59 +++++++++--------------------------------
 1 file changed, 12 insertions(+), 47 deletions(-)

Comments

Guenter Roeck Jan. 30, 2025, 2:53 p.m. UTC | #1

On Sat, Jan 25, 2025 at 01:39:43PM +0100, Wolfram Sang wrote:
> The I2C core now offers a debugfs-directory per client. Use it and
> remove the custom handling.
> 
> Signed-off-by: Wolfram Sang <[e-mail]>
> ---
...
>  
> -static int pt5161l_init_debugfs(struct pt5161l_data *data)

Please keep this function instead of moving the code into
the probe function.

Thanks,
Guenter

Patch

diff --git a/drivers/hwmon/pt5161l.c b/drivers/hwmon/pt5161l.c
index a9f0b23f9e76..1359d317024c 100644
--- a/drivers/hwmon/pt5161l.c
+++ b/drivers/hwmon/pt5161l.c
@@ -63,7 +63,6 @@  struct pt5161l_fw_ver {
 /* Each client has this additional data */
 struct pt5161l_data {
 	struct i2c_client *client;
-	struct dentry *debugfs;
 	struct pt5161l_fw_ver fw_ver;
 	struct mutex lock; /* for atomic I2C transactions */
 	bool init_done;
@@ -72,8 +71,6 @@  struct pt5161l_data {
 	bool mm_wide_reg_access; /* MM assisted wide register access */
 };
 
-static struct dentry *pt5161l_debugfs_dir;
-
 /*
  * Write multiple data bytes to Aries over I2C
  */
@@ -568,23 +565,6 @@  static const struct file_operations pt5161l_debugfs_ops_hb_sts = {
 	.open = simple_open,
 };
 
-static int pt5161l_init_debugfs(struct pt5161l_data *data)
-{
-	data->debugfs = debugfs_create_dir(dev_name(&data->client->dev),
-					   pt5161l_debugfs_dir);
-
-	debugfs_create_file("fw_ver", 0444, data->debugfs, data,
-			    &pt5161l_debugfs_ops_fw_ver);
-
-	debugfs_create_file("fw_load_status", 0444, data->debugfs, data,
-			    &pt5161l_debugfs_ops_fw_load_sts);
-
-	debugfs_create_file("heartbeat_status", 0444, data->debugfs, data,
-			    &pt5161l_debugfs_ops_hb_sts);
-
-	return 0;
-}
-
 static int pt5161l_probe(struct i2c_client *client)
 {
 	struct device *dev = &client->dev;
@@ -600,21 +580,21 @@  static int pt5161l_probe(struct i2c_client *client)
 	pt5161l_init_dev(data);
 	dev_set_drvdata(dev, data);
 
-	hwmon_dev = devm_hwmon_device_register_with_info(dev, client->name,
-							 data,
-							 &pt5161l_chip_info,
-							 NULL);
+	hwmon_dev = devm_hwmon_device_register_with_info(dev, client->name, data,
+							 &pt5161l_chip_info, NULL);
+	if (IS_ERR(hwmon_dev))
+		return PTR_ERR(hwmon_dev);
 
-	pt5161l_init_debugfs(data);
+	debugfs_create_file("fw_ver", 0444, client->debugfs, data,
+			    &pt5161l_debugfs_ops_fw_ver);
 
-	return PTR_ERR_OR_ZERO(hwmon_dev);
-}
+	debugfs_create_file("fw_load_status", 0444, client->debugfs, data,
+			    &pt5161l_debugfs_ops_fw_load_sts);
 
-static void pt5161l_remove(struct i2c_client *client)
-{
-	struct pt5161l_data *data = i2c_get_clientdata(client);
+	debugfs_create_file("heartbeat_status", 0444, client->debugfs, data,
+			    &pt5161l_debugfs_ops_hb_sts);
 
-	debugfs_remove_recursive(data->debugfs);
+	return 0;
 }
 
 static const struct of_device_id __maybe_unused pt5161l_of_match[] = {
@@ -643,24 +623,9 @@  static struct i2c_driver pt5161l_driver = {
 		.acpi_match_table = ACPI_PTR(pt5161l_acpi_match),
 	},
 	.probe = pt5161l_probe,
-	.remove = pt5161l_remove,
 	.id_table = pt5161l_id,
 };
-
-static int __init pt5161l_init(void)
-{
-	pt5161l_debugfs_dir = debugfs_create_dir("pt5161l", NULL);
-	return i2c_add_driver(&pt5161l_driver);
-}
-
-static void __exit pt5161l_exit(void)
-{
-	i2c_del_driver(&pt5161l_driver);
-	debugfs_remove_recursive(pt5161l_debugfs_dir);
-}
-
-module_init(pt5161l_init);
-module_exit(pt5161l_exit);
+module_i2c_driver(pt5161l_driver);
 
 MODULE_AUTHOR("Cosmo Chou <[e-mail]>");
 MODULE_DESCRIPTION("Hwmon driver for Astera Labs Aries PCIe retimer");