On lun, 2013-10-07 at 18:27 -0700, Greg Kroah-Hartman wrote: > The dev_attrs field of struct bus_type is going away soon, dev_groups > should be used instead. This converts the ipack bus code to use the > correct field. > > Cc: Samuel Iglesias Gonsalvez <sigles...@igalia.com> > Cc: Jens Taprogge <jens.tapro...@taprogge.org> > Cc: <industrypack-de...@lists.sourceforge.net> > Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> > --- > > Samuel and Jens, I can take this through my driver-core tree if you > don't want to take it through yours, just let me know what works best > for you. >
OK, you can take it through your driver-core tree.
Acked-by: Samuel Iglesias Gonsalvez <sigles...@igalia.com>
> drivers/ipack/ipack.c | 22 +++++++++++++++-------
> 1 file changed, 15 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/ipack/ipack.c b/drivers/ipack/ipack.c
> index 6e066c5..d0016ba 100644
> --- a/drivers/ipack/ipack.c
> +++ b/drivers/ipack/ipack.c
> @@ -180,20 +180,28 @@ static ssize_t modalias_show(struct device *dev, struct
> device_attribute *attr,
>
> ipack_device_attr(id_format, "0x%hhu\n");
>
> -static struct device_attribute ipack_dev_attrs[] = {
> - __ATTR_RO(id),
> - __ATTR_RO(id_device),
> - __ATTR_RO(id_format),
> - __ATTR_RO(id_vendor),
> - __ATTR_RO(modalias),
> +static DEVICE_ATTR_RO(id);
> +static DEVICE_ATTR_RO(id_device);
> +static DEVICE_ATTR_RO(id_format);
> +static DEVICE_ATTR_RO(id_vendor);
> +static DEVICE_ATTR_RO(modalias);
> +
> +static struct attribute *ipack_attrs[] = {
> + &dev_attr_id.attr,
> + &dev_attr_id_device.attr,
> + &dev_attr_id_format.attr,
> + &dev_attr_id_vendor.attr,
> + &dev_attr_modalias.attr,
> + NULL,
> };
> +ATTRIBUTE_GROUPS(ipack);
>
> static struct bus_type ipack_bus_type = {
> .name = "ipack",
> .probe = ipack_bus_probe,
> .match = ipack_bus_match,
> .remove = ipack_bus_remove,
> - .dev_attrs = ipack_dev_attrs,
> + .dev_groups = ipack_groups,
> .uevent = ipack_uevent,
> };
>
Thanks,
Sam
signature.asc
Description: This is a digitally signed message part
