Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933759AbaD3PQZ (ORCPT ); Wed, 30 Apr 2014 11:16:25 -0400 Received: from fw-tnat.austin.arm.com ([217.140.110.23]:53880 "EHLO collaborate-mta1.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759235AbaD3PQX (ORCPT ); Wed, 30 Apr 2014 11:16:23 -0400 Message-ID: <1398870979.24255.37.camel@hornet> Subject: Re: [PATCH 10/10] hwmon: vexpress: Use devm helper for hwmon device registration From: Pawel Moll To: Guenter Roeck Cc: "grant.likely@linaro.org" , Rob Herring , Samuel Ortiz , Lee Jones , Arnd Bergmann , Greg Kroah-Hartman , Russell King , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "arm@kernel.org" , Jean Delvare , "lm-sensors@lm-sensors.org" Date: Wed, 30 Apr 2014 16:16:19 +0100 In-Reply-To: <535EDD49.8050107@roeck-us.net> References: <1398707877-22596-1-git-send-email-pawel.moll@arm.com> <1398707877-22596-11-git-send-email-pawel.moll@arm.com> <535EDD49.8050107@roeck-us.net> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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/