Skip to contentSkip to conversation

pmbus: support for custom sysfs attributes

PATCH Superseded Patrick Venture 1 participant 2 messages Apr 15, 2019 Hardware monitoring

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/2 pmbus: support for custom sysfs attributes

From: [email protected]

This patch makes it possible to pass custom struct attribute_group array via the pmbus_driver_info struct so that those can be added to the attribute groups passed to hwmon_device_register_with_groups().

This makes it possible to register custom sysfs attributes by PMBUS drivers similar to how you can do this with most other busses/classes.

---
v3:
- staged before v3 hwmon/pmbus/isl68137 driver

---
 drivers/hwmon/pmbus/pmbus.h      |  3 +++
 drivers/hwmon/pmbus/pmbus_core.c | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
drivers/hwmon/pmbus/pmbus.h +3 -0
index 1d24397d36ecd..fb267ec116235 100644
@@ -417,6 +417,9 @@ struct pmbus_driver_info {
 	/* Regulator functionality, if supported by this chip driver. */
 	int num_regulators;
 	const struct regulator_desc *reg_desc;
+
+	/* custom attributes */
+	const struct attribute_group **groups;
 };
 
 /* Regulator ops */
drivers/hwmon/pmbus/pmbus_core.c +12 -1
index e2366428a9a91..d6170a802c0f7 100644
@@ -103,7 +103,7 @@ struct pmbus_data {
 	int max_attributes;
 	int num_attributes;
 	struct attribute_group group;
-	const struct attribute_group *groups[2];
+	const struct attribute_group **groups;
 	struct dentry *debugfs;		/* debugfs device directory */
 
 	struct pmbus_sensor *sensors;
@@ -2305,6 +2305,7 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
 	struct device *dev = &client->dev;
 	const struct pmbus_platform_data *pdata = dev_get_platdata(dev);
 	struct pmbus_data *data;
+	size_t groups_num = 0;
 	int ret;
 
 	if (!info)
@@ -2319,6 +2320,15 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
 	if (!data)
 		return -ENOMEM;
 
+	if (info->groups)
+		while (info->groups[groups_num])
+			groups_num++;
+
+	data->groups = devm_kcalloc(dev, groups_num + 2, sizeof(void *),
+				    GFP_KERNEL);
+	if (!data->groups)
+		return -ENOMEM;
+
 	i2c_set_clientdata(client, data);
 	mutex_init(&data->update_lock);
 	data->dev = dev;
@@ -2346,6 +2356,7 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
 	}
 
 	data->groups[0] = &data->group;
+	memcpy(data->groups + 1, info->groups, sizeof(void *) * groups_num);
 	data->hwmon_dev = hwmon_device_register_with_groups(dev, client->name,
 							    data, data->groups);
 	if (IS_ERR(data->hwmon_dev)) {
Signature · 1 line
2.21.0.392.gf8f6787159e-goog
#1 lore raw
Quoted 2 lines · Patrick Venture

From: [email protected]

My instance of git send-email didn't parse the From line correctly, my apologies.

Quoted 79 lines

This patch makes it possible to pass custom struct attribute_group array via the pmbus_driver_info struct so that those can be added to the attribute groups passed to hwmon_device_register_with_groups().

This makes it possible to register custom sysfs attributes by PMBUS drivers similar to how you can do this with most other busses/classes.

---
v3:
- staged before v3 hwmon/pmbus/isl68137 driver

---
 drivers/hwmon/pmbus/pmbus.h      |  3 +++
 drivers/hwmon/pmbus/pmbus_core.c | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
drivers/hwmon/pmbus/pmbus.h +3 -0
index 1d24397d36ecd..fb267ec116235 100644
@@ -417,6 +417,9 @@ struct pmbus_driver_info {
        /* Regulator functionality, if supported by this chip driver. */
        int num_regulators;
        const struct regulator_desc *reg_desc;
+
+       /* custom attributes */
+       const struct attribute_group **groups;
 };
 
 /* Regulator ops */
drivers/hwmon/pmbus/pmbus_core.c +12 -2
index e2366428a9a91..d6170a802c0f7 100644
@@ -103,7 +103,7 @@ struct pmbus_data {
        int max_attributes;
        int num_attributes;
        struct attribute_group group;
-       const struct attribute_group *groups[2];
+       const struct attribute_group **groups;
        struct dentry *debugfs;         /* debugfs device directory */
 
        struct pmbus_sensor *sensors;
@@ -2305,6 +2305,7 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
        struct device *dev = &client->dev;
        const struct pmbus_platform_data *pdata = dev_get_platdata(dev);
        struct pmbus_data *data;
+       size_t groups_num = 0;
        int ret;
 
        if (!info)
@@ -2319,6 +2320,15 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
        if (!data)
                return -ENOMEM;
 
+       if (info->groups)
+               while (info->groups[groups_num])
+                       groups_num++;
+
+       data->groups = devm_kcalloc(dev, groups_num + 2, sizeof(void *),
+                                   GFP_KERNEL);
+       if (!data->groups)
+               return -ENOMEM;
+
        i2c_set_clientdata(client, data);
        mutex_init(&data->update_lock);
        data->dev = dev;
@@ -2346,6 +2356,7 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
        }
 
        data->groups[0] = &data->group;
+       memcpy(data->groups + 1, info->groups, sizeof(void *) * groups_num);
        data->hwmon_dev = hwmon_device_register_with_groups(dev, client->name,
                                                            data, data->groups);
        if (IS_ERR(data->hwmon_dev)) {
--

2.21.0.392.gf8f6787159e-goog