| Message ID | 20220907015405.16547-2-mr.nuke.me@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | None | expand |
On Tue, Sep 06, 2022 at 08:54:05PM -0500, Alexandru Gagniuc wrote: > On systems with more than one tps23861, creating the debugfs directory > for additional devices fails with > > debugfs: Directory 'tps23861' with parent '/' already present! > > To resolve this, include the hwmon device name in the directory name. > Since the name is unique, this guarantees that the debugfs directory > is unique. > > Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> > Reviewed-by: Guenter Roeck <linux@roeck-us.net> Applied to hwmon-next. Thanks, Guenter > --- > drivers/hwmon/tps23861.c | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) > > diff --git a/drivers/hwmon/tps23861.c b/drivers/hwmon/tps23861.c > index 019009b71a90..a3d7d6b75a26 100644 > --- a/drivers/hwmon/tps23861.c > +++ b/drivers/hwmon/tps23861.c > @@ -503,9 +503,17 @@ static int tps23861_port_status_show(struct seq_file *s, void *data) > > DEFINE_SHOW_ATTRIBUTE(tps23861_port_status); > > -static void tps23861_init_debugfs(struct tps23861_data *data) > +static void tps23861_init_debugfs(struct tps23861_data *data, > + struct device *hwmon_dev) > { > - data->debugfs_dir = debugfs_create_dir(data->client->name, NULL); > + const char *debugfs_name; > + > + debugfs_name = devm_kasprintf(&data->client->dev, GFP_KERNEL, "%s-%s", > + data->client->name, dev_name(hwmon_dev)); > + if (!debugfs_name) > + return; > + > + data->debugfs_dir = debugfs_create_dir(debugfs_name, NULL); > > debugfs_create_file("port_status", > 0400, > @@ -554,7 +562,7 @@ static int tps23861_probe(struct i2c_client *client) > if (IS_ERR(hwmon_dev)) > return PTR_ERR(hwmon_dev); > > - tps23861_init_debugfs(data); > + tps23861_init_debugfs(data, hwmon_dev); > > return 0; > }
diff --git a/drivers/hwmon/tps23861.c b/drivers/hwmon/tps23861.c index 019009b71a90..a3d7d6b75a26 100644 --- a/drivers/hwmon/tps23861.c +++ b/drivers/hwmon/tps23861.c @@ -503,9 +503,17 @@ static int tps23861_port_status_show(struct seq_file *s, void *data) DEFINE_SHOW_ATTRIBUTE(tps23861_port_status); -static void tps23861_init_debugfs(struct tps23861_data *data) +static void tps23861_init_debugfs(struct tps23861_data *data, + struct device *hwmon_dev) { - data->debugfs_dir = debugfs_create_dir(data->client->name, NULL); + const char *debugfs_name; + + debugfs_name = devm_kasprintf(&data->client->dev, GFP_KERNEL, "%s-%s", + data->client->name, dev_name(hwmon_dev)); + if (!debugfs_name) + return; + + data->debugfs_dir = debugfs_create_dir(debugfs_name, NULL); debugfs_create_file("port_status", 0400, @@ -554,7 +562,7 @@ static int tps23861_probe(struct i2c_client *client) if (IS_ERR(hwmon_dev)) return PTR_ERR(hwmon_dev); - tps23861_init_debugfs(data); + tps23861_init_debugfs(data, hwmon_dev); return 0; }
On systems with more than one tps23861, creating the debugfs directory for additional devices fails with debugfs: Directory 'tps23861' with parent '/' already present! To resolve this, include the hwmon device name in the directory name. Since the name is unique, this guarantees that the debugfs directory is unique. Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> --- drivers/hwmon/tps23861.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)