| Message ID | 1398707877-22596-11-git-send-email-pawel.moll@arm.com |
|---|---|
| State | New |
| Headers | show |
On 04/28/2014 10:57 AM, Pawel Moll wrote: > Use devm_hwmon_device_register_with_groups instead of > the old-style manual attributes and hwmon device registration. > > Also, unwind the attribute group macros for better code > readability. > > Cc: Jean Delvare <jdelvare@suse.de> > Cc: Guenter Roeck <linux@roeck-us.net> > Cc: lm-sensors@lm-sensors.org > Signed-off-by: Pawel Moll <pawel.moll@arm.com> > --- > drivers/hwmon/vexpress.c | 91 ++++++++++++++++-------------------------------- > 1 file changed, 30 insertions(+), 61 deletions(-) > > diff --git a/drivers/hwmon/vexpress.c b/drivers/hwmon/vexpress.c > index d853332..ed6bf0e 100644 > --- a/drivers/hwmon/vexpress.c > +++ b/drivers/hwmon/vexpress.c > @@ -27,17 +27,8 @@ > struct vexpress_hwmon_data { > struct device *hwmon_dev; > struct regmap *reg; > - const char *name; > }; > > -static ssize_t vexpress_hwmon_name_show(struct device *dev, > - struct device_attribute *dev_attr, char *buffer) > -{ > - struct vexpress_hwmon_data *data = dev_get_drvdata(dev); > - > - return sprintf(buffer, "%s\n", data->name); > -} > - > static ssize_t vexpress_hwmon_label_show(struct device *dev, > struct device_attribute *dev_attr, char *buffer) > { > @@ -95,16 +86,6 @@ static umode_t vexpress_hwmon_attr_is_visible(struct kobject *kobj, > return attr->mode; > } > > -static DEVICE_ATTR(name, S_IRUGO, vexpress_hwmon_name_show, NULL); > - > -#define VEXPRESS_HWMON_ATTRS(_name, _label_attr, _input_attr) \ > -struct attribute *vexpress_hwmon_attrs_##_name[] = { \ > - &dev_attr_name.attr, \ > - &dev_attr_##_label_attr.attr, \ > - &sensor_dev_attr_##_input_attr.dev_attr.attr, \ > - NULL \ > -} > - > struct vexpress_hwmon_type { > const char *name; > const struct attribute_group **attr_groups; > @@ -114,10 +95,13 @@ struct vexpress_hwmon_type { > static DEVICE_ATTR(in1_label, S_IRUGO, vexpress_hwmon_label_show, NULL); > static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, vexpress_hwmon_u32_show, > NULL, 1000); > -static VEXPRESS_HWMON_ATTRS(volt, in1_label, in1_input); > static struct attribute_group vexpress_hwmon_group_volt = { > .is_visible = vexpress_hwmon_attr_is_visible, > - .attrs = vexpress_hwmon_attrs_volt, > + .attrs = (struct attribute *[]) { Is this typecast necessary ? > + &dev_attr_in1_label.attr, > + &sensor_dev_attr_in1_input.dev_attr.attr, > + NULL > + }, > }; > static struct vexpress_hwmon_type vexpress_hwmon_volt = { > .name = "vexpress_volt", > @@ -131,10 +115,13 @@ static struct vexpress_hwmon_type vexpress_hwmon_volt = { > static DEVICE_ATTR(curr1_label, S_IRUGO, vexpress_hwmon_label_show, NULL); > static SENSOR_DEVICE_ATTR(curr1_input, S_IRUGO, vexpress_hwmon_u32_show, > NULL, 1000); > -static VEXPRESS_HWMON_ATTRS(amp, curr1_label, curr1_input); > static struct attribute_group vexpress_hwmon_group_amp = { > .is_visible = vexpress_hwmon_attr_is_visible, > - .attrs = vexpress_hwmon_attrs_amp, > + .attrs = (struct attribute *[]) { > + &dev_attr_curr1_label.attr, > + &sensor_dev_attr_curr1_input.dev_attr.attr, > + NULL > + }, > }; > static struct vexpress_hwmon_type vexpress_hwmon_amp = { > .name = "vexpress_amp", > @@ -147,10 +134,13 @@ static struct vexpress_hwmon_type vexpress_hwmon_amp = { > static DEVICE_ATTR(temp1_label, S_IRUGO, vexpress_hwmon_label_show, NULL); > static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, vexpress_hwmon_u32_show, > NULL, 1000); > -static VEXPRESS_HWMON_ATTRS(temp, temp1_label, temp1_input); > static struct attribute_group vexpress_hwmon_group_temp = { > .is_visible = vexpress_hwmon_attr_is_visible, > - .attrs = vexpress_hwmon_attrs_temp, > + .attrs = (struct attribute *[]) { > + &dev_attr_temp1_label.attr, > + &sensor_dev_attr_temp1_input.dev_attr.attr, > + NULL > + }, > }; > static struct vexpress_hwmon_type vexpress_hwmon_temp = { > .name = "vexpress_temp", > @@ -163,10 +153,13 @@ static struct vexpress_hwmon_type vexpress_hwmon_temp = { > static DEVICE_ATTR(power1_label, S_IRUGO, vexpress_hwmon_label_show, NULL); > static SENSOR_DEVICE_ATTR(power1_input, S_IRUGO, vexpress_hwmon_u32_show, > NULL, 1); > -static VEXPRESS_HWMON_ATTRS(power, power1_label, power1_input); > static struct attribute_group vexpress_hwmon_group_power = { > .is_visible = vexpress_hwmon_attr_is_visible, > - .attrs = vexpress_hwmon_attrs_power, > + .attrs = (struct attribute *[]) { > + &dev_attr_power1_label.attr, > + &sensor_dev_attr_power1_input.dev_attr.attr, > + NULL > + }, > }; > static struct vexpress_hwmon_type vexpress_hwmon_power = { > .name = "vexpress_power", > @@ -179,10 +172,13 @@ static struct vexpress_hwmon_type vexpress_hwmon_power = { > static DEVICE_ATTR(energy1_label, S_IRUGO, vexpress_hwmon_label_show, NULL); > static SENSOR_DEVICE_ATTR(energy1_input, S_IRUGO, vexpress_hwmon_u64_show, > NULL, 1); > -static VEXPRESS_HWMON_ATTRS(energy, energy1_label, energy1_input); > static struct attribute_group vexpress_hwmon_group_energy = { > .is_visible = vexpress_hwmon_attr_is_visible, > - .attrs = vexpress_hwmon_attrs_energy, > + .attrs = (struct attribute *[]) { > + &dev_attr_energy1_label.attr, > + &sensor_dev_attr_energy1_input.dev_attr.attr, > + NULL > + }, > }; > static struct vexpress_hwmon_type vexpress_hwmon_energy = { > .name = "vexpress_energy", > @@ -218,7 +214,6 @@ MODULE_DEVICE_TABLE(of, vexpress_hwmon_of_match); > > static int vexpress_hwmon_probe(struct platform_device *pdev) > { > - int err; > const struct of_device_id *match; > struct vexpress_hwmon_data *data; > const struct vexpress_hwmon_type *type; > @@ -232,45 +227,19 @@ static int vexpress_hwmon_probe(struct platform_device *pdev) > if (!match) > return -ENODEV; > type = match->data; > - data->name = type->name; > > data->reg = devm_regmap_init_vexpress_config(&pdev->dev); > - if (!data->reg) > - return -ENODEV; > - > - err = sysfs_create_groups(&pdev->dev.kobj, type->attr_groups); > - if (err) > - goto error; > - > - data->hwmon_dev = hwmon_device_register(&pdev->dev); > - if (IS_ERR(data->hwmon_dev)) { > - err = PTR_ERR(data->hwmon_dev); > - goto error; > - } > + if (IS_ERR(data->reg)) > + return PTR_ERR(data->reg); Did the API for devm_regmap_init_vexpress_config change ? If so, it might make sense to separate this out into a separate patch, together with the API change (it is a logically different change). Otherwise looks good. One question - I seem to be unable to apply the patch. What is your baseline branch / repository ? Thanks, Guenter -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On Mon, 2014-04-28 at 23:59 +0100, Guenter Roeck wrote: > On 04/28/2014 10:uct attribute_group **attr_groups; > > @@ -114,10 +95,13 @@ struct vexpress_hwmon_type { > > static DEVICE_ATTR(in1_label, S_IRUGO, vexpress_hwmon_label_show, NULL); > > static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, vexpress_hwmon_u32_show, > > NULL, 1000); > > -static VEXPRESS_HWMON_ATTRS(volt, in1_label, in1_input); > > static struct attribute_group vexpress_hwmon_group_volt = { > > .is_visible = vexpress_hwmon_attr_is_visible, > > - .attrs = vexpress_hwmon_attrs_volt, > > + .attrs = (struct attribute *[]) { > > Is this typecast necessary ? Yes, it's the gcc extension that allows compound literals to be used for static structure members initialization. I like it, because it makes them easier to understand (in my opinion, that is), but if you prefer the classic approach, I'll unroll VEXPRESS_HWMON_ATTRS into: static struct attribute vexpress_hwmon_attrs_volt = { &dev_attr_in1_label.attr, &sensor_dev_attr_in1_input.dev_attr.attr, NULL }; And keep static struct attribute_group vexpress_hwmon_group_volt = { .is_visible = vexpress_hwmon_attr_is_visible, .attrs = vexpress_hwmon_attrs_volt, }; > > @@ -232,45 +227,19 @@ static int vexpress_hwmon_probe(struct platform_device *pdev) > > if (!match) > > return -ENODEV; > > type = match->data; > > - data->name = type->name; > > > > data->reg = devm_regmap_init_vexpress_config(&pdev->dev); > > - if (!data->reg) > > - return -ENODEV; > > - > > - err = sysfs_create_groups(&pdev->dev.kobj, type->attr_groups); > > - if (err) > > - goto error; > > - > > - data->hwmon_dev = hwmon_device_register(&pdev->dev); > > - if (IS_ERR(data->hwmon_dev)) { > > - err = PTR_ERR(data->hwmon_dev); > > - goto error; > > - } > > + if (IS_ERR(data->reg)) > > + return PTR_ERR(data->reg); > > Did the API for devm_regmap_init_vexpress_config change ? > If so, it might make sense to separate this out into a separate patch, > together with the API change (it is a logically different change). I'm not sure I understand the question. The other patch from the series I've copied you on (http://article.gmane.org/gmane.linux.ports.arm.kernel/320577 "[PATCH 02/10] mfd: vexpress: Convert custom func API to regmap") changes - data->func = vexpress_config_func_get_by_dev(&pdev->dev); into + data->reg = devm_regmap_init_vexpress_config(&pdev->dev); Your ack there, by the way, will be really appreciated :-) > One question - I seem to be unable to apply the patch. What is your > baseline branch / repository ? The whole series, based on v3.15-rc3 lives here: git://git.linaro.org/people/pawel.moll/linux.git vexpress/sysreg Pawel -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On Wed, Apr 30, 2014 at 04:16:19PM +0100, Pawel Moll wrote: > On Mon, 2014-04-28 at 23:59 +0100, Guenter Roeck wrote: > > On 04/28/2014 10:uct attribute_group **attr_groups; > > > @@ -114,10 +95,13 @@ struct vexpress_hwmon_type { > > > static DEVICE_ATTR(in1_label, S_IRUGO, vexpress_hwmon_label_show, NULL); > > > static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, vexpress_hwmon_u32_show, > > > NULL, 1000); > > > -static VEXPRESS_HWMON_ATTRS(volt, in1_label, in1_input); > > > static struct attribute_group vexpress_hwmon_group_volt = { > > > .is_visible = vexpress_hwmon_attr_is_visible, > > > - .attrs = vexpress_hwmon_attrs_volt, > > > + .attrs = (struct attribute *[]) { > > > > Is this typecast necessary ? > > Yes, it's the gcc extension that allows compound literals to be used for > static structure members initialization. I like it, because it makes > them easier to understand (in my opinion, that is), but if you prefer > the classic approach, I'll unroll VEXPRESS_HWMON_ATTRS into: > > static struct attribute vexpress_hwmon_attrs_volt = { > &dev_attr_in1_label.attr, > &sensor_dev_attr_in1_input.dev_attr.attr, > NULL > }; > > And keep > > static struct attribute_group vexpress_hwmon_group_volt = { > .is_visible = vexpress_hwmon_attr_is_visible, > .attrs = vexpress_hwmon_attrs_volt, > }; > Yes, would be great if you can do that. > > > @@ -232,45 +227,19 @@ static int vexpress_hwmon_probe(struct platform_device *pdev) > > > if (!match) > > > return -ENODEV; > > > type = match->data; > > > - data->name = type->name; > > > > > > data->reg = devm_regmap_init_vexpress_config(&pdev->dev); > > > - if (!data->reg) > > > - return -ENODEV; > > > - > > > - err = sysfs_create_groups(&pdev->dev.kobj, type->attr_groups); > > > - if (err) > > > - goto error; > > > - > > > - data->hwmon_dev = hwmon_device_register(&pdev->dev); > > > - if (IS_ERR(data->hwmon_dev)) { > > > - err = PTR_ERR(data->hwmon_dev); > > > - goto error; > > > - } > > > + if (IS_ERR(data->reg)) > > > + return PTR_ERR(data->reg); > > > > Did the API for devm_regmap_init_vexpress_config change ? > > If so, it might make sense to separate this out into a separate patch, > > together with the API change (it is a logically different change). > > I'm not sure I understand the question. The other patch from the series The code above seems to change from data->reg = devm_regmap_init_vexpress_config(&pdev->dev); if (!data->reg) return -ENODEV; to data->reg = devm_regmap_init_vexpress_config(&pdev->dev); if (IS_ERR(data->reg)) return PTR_ERR(data->reg); as part of this patch. This suggests that the return value from devm_regmap_init_vexpress_config may have changed from NULL to ERR_PTR. Is my understanding wrong ? > I've copied you on > (http://article.gmane.org/gmane.linux.ports.arm.kernel/320577 "[PATCH > 02/10] mfd: vexpress: Convert custom func API to regmap") changes > > - data->func = vexpress_config_func_get_by_dev(&pdev->dev); > > into > > + data->reg = devm_regmap_init_vexpress_config(&pdev->dev); > > Your ack there, by the way, will be really appreciated :-) > I'll have a look. > > One question - I seem to be unable to apply the patch. What is your > > baseline branch / repository ? > > The whole series, based on v3.15-rc3 lives here: > > git://git.linaro.org/people/pawel.moll/linux.git vexpress/sysreg > Great, thanks. Guenter -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On Wed, 2014-04-30 at 16:27 +0100, Guenter Roeck wrote: > > I'm not sure I understand the question. The other patch from the series > > The code above seems to change from > > data->reg = devm_regmap_init_vexpress_config(&pdev->dev); > if (!data->reg) > return -ENODEV; > > to > > data->reg = devm_regmap_init_vexpress_config(&pdev->dev); > if (IS_ERR(data->reg)) > return PTR_ERR(data->reg); > > as part of this patch. This suggests that the return value from > devm_regmap_init_vexpress_config may have changed from NULL to > ERR_PTR. Is my understanding wrong ? No, you've got it right, but it's me making a mistake in patch splitting - it is supposed to be a part of the first patch. Thanks for spotting this! Pawel -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/drivers/hwmon/vexpress.c b/drivers/hwmon/vexpress.c index d853332..ed6bf0e 100644 --- a/drivers/hwmon/vexpress.c +++ b/drivers/hwmon/vexpress.c @@ -27,17 +27,8 @@ struct vexpress_hwmon_data { struct device *hwmon_dev; struct regmap *reg; - const char *name; }; -static ssize_t vexpress_hwmon_name_show(struct device *dev, - struct device_attribute *dev_attr, char *buffer) -{ - struct vexpress_hwmon_data *data = dev_get_drvdata(dev); - - return sprintf(buffer, "%s\n", data->name); -} - static ssize_t vexpress_hwmon_label_show(struct device *dev, struct device_attribute *dev_attr, char *buffer) { @@ -95,16 +86,6 @@ static umode_t vexpress_hwmon_attr_is_visible(struct kobject *kobj, return attr->mode; } -static DEVICE_ATTR(name, S_IRUGO, vexpress_hwmon_name_show, NULL); - -#define VEXPRESS_HWMON_ATTRS(_name, _label_attr, _input_attr) \ -struct attribute *vexpress_hwmon_attrs_##_name[] = { \ - &dev_attr_name.attr, \ - &dev_attr_##_label_attr.attr, \ - &sensor_dev_attr_##_input_attr.dev_attr.attr, \ - NULL \ -} - struct vexpress_hwmon_type { const char *name; const struct attribute_group **attr_groups; @@ -114,10 +95,13 @@ struct vexpress_hwmon_type { static DEVICE_ATTR(in1_label, S_IRUGO, vexpress_hwmon_label_show, NULL); static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, vexpress_hwmon_u32_show, NULL, 1000); -static VEXPRESS_HWMON_ATTRS(volt, in1_label, in1_input); static struct attribute_group vexpress_hwmon_group_volt = { .is_visible = vexpress_hwmon_attr_is_visible, - .attrs = vexpress_hwmon_attrs_volt, + .attrs = (struct attribute *[]) { + &dev_attr_in1_label.attr, + &sensor_dev_attr_in1_input.dev_attr.attr, + NULL + }, }; static struct vexpress_hwmon_type vexpress_hwmon_volt = { .name = "vexpress_volt", @@ -131,10 +115,13 @@ static struct vexpress_hwmon_type vexpress_hwmon_volt = { static DEVICE_ATTR(curr1_label, S_IRUGO, vexpress_hwmon_label_show, NULL); static SENSOR_DEVICE_ATTR(curr1_input, S_IRUGO, vexpress_hwmon_u32_show, NULL, 1000); -static VEXPRESS_HWMON_ATTRS(amp, curr1_label, curr1_input); static struct attribute_group vexpress_hwmon_group_amp = { .is_visible = vexpress_hwmon_attr_is_visible, - .attrs = vexpress_hwmon_attrs_amp, + .attrs = (struct attribute *[]) { + &dev_attr_curr1_label.attr, + &sensor_dev_attr_curr1_input.dev_attr.attr, + NULL + }, }; static struct vexpress_hwmon_type vexpress_hwmon_amp = { .name = "vexpress_amp", @@ -147,10 +134,13 @@ static struct vexpress_hwmon_type vexpress_hwmon_amp = { static DEVICE_ATTR(temp1_label, S_IRUGO, vexpress_hwmon_label_show, NULL); static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, vexpress_hwmon_u32_show, NULL, 1000); -static VEXPRESS_HWMON_ATTRS(temp, temp1_label, temp1_input); static struct attribute_group vexpress_hwmon_group_temp = { .is_visible = vexpress_hwmon_attr_is_visible, - .attrs = vexpress_hwmon_attrs_temp, + .attrs = (struct attribute *[]) { + &dev_attr_temp1_label.attr, + &sensor_dev_attr_temp1_input.dev_attr.attr, + NULL + }, }; static struct vexpress_hwmon_type vexpress_hwmon_temp = { .name = "vexpress_temp", @@ -163,10 +153,13 @@ static struct vexpress_hwmon_type vexpress_hwmon_temp = { static DEVICE_ATTR(power1_label, S_IRUGO, vexpress_hwmon_label_show, NULL); static SENSOR_DEVICE_ATTR(power1_input, S_IRUGO, vexpress_hwmon_u32_show, NULL, 1); -static VEXPRESS_HWMON_ATTRS(power, power1_label, power1_input); static struct attribute_group vexpress_hwmon_group_power = { .is_visible = vexpress_hwmon_attr_is_visible, - .attrs = vexpress_hwmon_attrs_power, + .attrs = (struct attribute *[]) { + &dev_attr_power1_label.attr, + &sensor_dev_attr_power1_input.dev_attr.attr, + NULL + }, }; static struct vexpress_hwmon_type vexpress_hwmon_power = { .name = "vexpress_power", @@ -179,10 +172,13 @@ static struct vexpress_hwmon_type vexpress_hwmon_power = { static DEVICE_ATTR(energy1_label, S_IRUGO, vexpress_hwmon_label_show, NULL); static SENSOR_DEVICE_ATTR(energy1_input, S_IRUGO, vexpress_hwmon_u64_show, NULL, 1); -static VEXPRESS_HWMON_ATTRS(energy, energy1_label, energy1_input); static struct attribute_group vexpress_hwmon_group_energy = { .is_visible = vexpress_hwmon_attr_is_visible, - .attrs = vexpress_hwmon_attrs_energy, + .attrs = (struct attribute *[]) { + &dev_attr_energy1_label.attr, + &sensor_dev_attr_energy1_input.dev_attr.attr, + NULL + }, }; static struct vexpress_hwmon_type vexpress_hwmon_energy = { .name = "vexpress_energy", @@ -218,7 +214,6 @@ MODULE_DEVICE_TABLE(of, vexpress_hwmon_of_match); static int vexpress_hwmon_probe(struct platform_device *pdev) { - int err; const struct of_device_id *match; struct vexpress_hwmon_data *data; const struct vexpress_hwmon_type *type; @@ -232,45 +227,19 @@ static int vexpress_hwmon_probe(struct platform_device *pdev) if (!match) return -ENODEV; type = match->data; - data->name = type->name; data->reg = devm_regmap_init_vexpress_config(&pdev->dev); - if (!data->reg) - return -ENODEV; - - err = sysfs_create_groups(&pdev->dev.kobj, type->attr_groups); - if (err) - goto error; - - data->hwmon_dev = hwmon_device_register(&pdev->dev); - if (IS_ERR(data->hwmon_dev)) { - err = PTR_ERR(data->hwmon_dev); - goto error; - } + if (IS_ERR(data->reg)) + return PTR_ERR(data->reg); - return 0; - -error: - sysfs_remove_group(&pdev->dev.kobj, match->data); - return err; -} - -static int vexpress_hwmon_remove(struct platform_device *pdev) -{ - struct vexpress_hwmon_data *data = platform_get_drvdata(pdev); - const struct of_device_id *match; - - hwmon_device_unregister(data->hwmon_dev); - - match = of_match_device(vexpress_hwmon_of_match, &pdev->dev); - sysfs_remove_group(&pdev->dev.kobj, match->data); + data->hwmon_dev = devm_hwmon_device_register_with_groups(&pdev->dev, + type->name, data, type->attr_groups); - return 0; + return PTR_ERR_OR_ZERO(data->hwmon_dev); } static struct platform_driver vexpress_hwmon_driver = { .probe = vexpress_hwmon_probe, - .remove = vexpress_hwmon_remove, .driver = { .name = DRVNAME, .owner = THIS_MODULE,
Use devm_hwmon_device_register_with_groups instead of the old-style manual attributes and hwmon device registration. Also, unwind the attribute group macros for better code readability. Cc: Jean Delvare <jdelvare@suse.de> Cc: Guenter Roeck <linux@roeck-us.net> Cc: lm-sensors@lm-sensors.org Signed-off-by: Pawel Moll <pawel.moll@arm.com> --- drivers/hwmon/vexpress.c | 91 ++++++++++++++++-------------------------------- 1 file changed, 30 insertions(+), 61 deletions(-)