diff mbox series

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

Message ID 20250125123941.36729-13-wsa+renesas@sang-engineering.com (mailing list archive)
State Changes Requested
Headers show
Series hwmon: Use per-client debugfs entry | expand

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 <wsa+renesas@sang-engineering.com>
---
 drivers/hwmon/sht3x.c | 57 ++++++-------------------------------------
 1 file changed, 8 insertions(+), 49 deletions(-)

Comments

Guenter Roeck Jan. 30, 2025, 3:07 p.m. UTC | #1 
On Sat, Jan 25, 2025 at 01:39:45PM +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 <wsa+renesas@sang-engineering.com>
> ---
>  static int sht3x_serial_number_read(struct sht3x_data *data)
>  {
>  	int ret;
> @@ -931,27 +913,17 @@ static int sht3x_probe(struct i2c_client *client)
>  		return ret;
>  
>  	ret = sht3x_serial_number_read(data);
> -	if (ret) {
> +	if (ret)
>  		dev_dbg(dev, "unable to read serial number\n");
> -	} else {
> -		sht3x_debugfs_init(data);
> -		ret = devm_add_action_or_reset(dev,
> -					       sht3x_debugfs_remove,
> -					       data->sensor_dir);
> -		if (ret)
> -			return ret;
> -	}
> -
> -	hwmon_dev = devm_hwmon_device_register_with_info(dev,
> -							 client->name,
> -							 data,
> -							 &sht3x_chip_info,
> -							 sht3x_groups);
>  
> +	hwmon_dev = devm_hwmon_device_register_with_info(dev, client->name, data,
> +							 &sht3x_chip_info, sht3x_groups);
>  	if (IS_ERR(hwmon_dev))
> -		dev_dbg(dev, "unable to register hwmon device\n");
> +		return PTR_ERR(hwmon_dev);
>  
> -	return PTR_ERR_OR_ZERO(hwmon_dev);
> +	debugfs_create_u32("serial_number", 0444, client->debugfs, &data->serial_number);

This changes code behavior: It now always creates the debugfs file
even if the serial number is not available. The debugfs file should
only be created if the serial number is available.

Guenter
diff mbox series

Patch

diff --git a/drivers/hwmon/sht3x.c b/drivers/hwmon/sht3x.c
index 650b0bcc2359..a6e7449de396 100644
--- a/drivers/hwmon/sht3x.c
+++ b/drivers/hwmon/sht3x.c
@@ -44,8 +44,6 @@  static const unsigned char sht3x_cmd_read_status_reg[]         = { 0xf3, 0x2d };
 static const unsigned char sht3x_cmd_clear_status_reg[]        = { 0x30, 0x41 };
 static const unsigned char sht3x_cmd_read_serial_number[]      = { 0x37, 0x80 };
 
-static struct dentry *debugfs;
-
 /* delays for single-shot mode i2c commands, both in us */
 #define SHT3X_SINGLE_WAIT_TIME_HPM  15000
 #define SHT3X_SINGLE_WAIT_TIME_MPM   6000
@@ -837,22 +835,6 @@  static int sht3x_write(struct device *dev, enum hwmon_sensor_types type,
 	}
 }
 
-static void sht3x_debugfs_init(struct sht3x_data *data)
-{
-	char name[32];
-
-	snprintf(name, sizeof(name), "i2c%u-%02x",
-		 data->client->adapter->nr, data->client->addr);
-	data->sensor_dir = debugfs_create_dir(name, debugfs);
-	debugfs_create_u32("serial_number", 0444,
-			   data->sensor_dir, &data->serial_number);
-}
-
-static void sht3x_debugfs_remove(void *sensor_dir)
-{
-	debugfs_remove_recursive(sensor_dir);
-}
-
 static int sht3x_serial_number_read(struct sht3x_data *data)
 {
 	int ret;
@@ -931,27 +913,17 @@  static int sht3x_probe(struct i2c_client *client)
 		return ret;
 
 	ret = sht3x_serial_number_read(data);
-	if (ret) {
+	if (ret)
 		dev_dbg(dev, "unable to read serial number\n");
-	} else {
-		sht3x_debugfs_init(data);
-		ret = devm_add_action_or_reset(dev,
-					       sht3x_debugfs_remove,
-					       data->sensor_dir);
-		if (ret)
-			return ret;
-	}
-
-	hwmon_dev = devm_hwmon_device_register_with_info(dev,
-							 client->name,
-							 data,
-							 &sht3x_chip_info,
-							 sht3x_groups);
 
+	hwmon_dev = devm_hwmon_device_register_with_info(dev, client->name, data,
+							 &sht3x_chip_info, sht3x_groups);
 	if (IS_ERR(hwmon_dev))
-		dev_dbg(dev, "unable to register hwmon device\n");
+		return PTR_ERR(hwmon_dev);
 
-	return PTR_ERR_OR_ZERO(hwmon_dev);
+	debugfs_create_u32("serial_number", 0444, client->debugfs, &data->serial_number);
+
+	return 0;
 }
 
 /* device ID table */
@@ -968,20 +940,7 @@  static struct i2c_driver sht3x_i2c_driver = {
 	.probe       = sht3x_probe,
 	.id_table    = sht3x_ids,
 };
-
-static int __init sht3x_init(void)
-{
-	debugfs = debugfs_create_dir("sht3x", NULL);
-	return i2c_add_driver(&sht3x_i2c_driver);
-}
-module_init(sht3x_init);
-
-static void __exit sht3x_cleanup(void)
-{
-	debugfs_remove_recursive(debugfs);
-	i2c_del_driver(&sht3x_i2c_driver);
-}
-module_exit(sht3x_cleanup);
+module_i2c_driver(sht3x_i2c_driver);
 
 MODULE_AUTHOR("David Frey <david.frey@sensirion.com>");
 MODULE_AUTHOR("Pascal Sachs <pascal.sachs@sensirion.com>");