Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f4ac349 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

sh: superhyway: use dev_groups and not dev_attrs for bus_type 



The dev_attrs field has long been "depreciated" and is finally being
removed, so move the driver to use the "correct" dev_groups field
instead for struct bus_type.

Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: <linux-sh@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 39afc7af

drivers/sh/superhyway/superhyway-sysfs.c

+19 −10
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ static ssize_t name##_show(struct device *dev, struct device_attribute *attr, ch 
{									\

	struct superhyway_device *s = to_superhyway_device(dev);	\

	return sprintf(buf, fmt, s->field);				\

}

}									\

static DEVICE_ATTR_RO(name);



/* VCR flags */

superhyway_ro_attr(perr_flags, "0x%02x\n", vcr.perr_flags);
@@ -32,14 +33,22 @@ superhyway_ro_attr(top_mb, "0x%02x\n", vcr.top_mb); 
/* Misc */

superhyway_ro_attr(resource, "0x%08lx\n", resource[0].start);



struct device_attribute superhyway_dev_attrs[] = {

	__ATTR_RO(perr_flags),

	__ATTR_RO(merr_flags),

	__ATTR_RO(mod_vers),

	__ATTR_RO(mod_id),

	__ATTR_RO(bot_mb),

	__ATTR_RO(top_mb),

	__ATTR_RO(resource),

	__ATTR_NULL,

static struct attribute *superhyway_dev_attrs[] = {

	&dev_attr_perr_flags.attr,

	&dev_attr_merr_flags.attr,

	&dev_attr_mod_vers.attr,

	&dev_attr_mod_id.attr,

	&dev_attr_bot_mb.attr,

	&dev_attr_top_mb.attr,

	&dev_attr_resource.attr,

	NULL,

};



static const struct attribute_group superhyway_dev_group = {

	.attrs = superhyway_dev_attrs,

};



const struct attribute_group *superhyway_dev_groups[] = {

	&superhyway_dev_group,

	NULL,

};

drivers/sh/superhyway/superhyway.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ struct bus_type superhyway_bus_type = { 
	.name		= "superhyway",

	.match		= superhyway_bus_match,

#ifdef CONFIG_SYSFS

	.dev_attrs	= superhyway_dev_attrs,

	.dev_groups	= superhyway_dev_groups,

#endif

	.probe		= superhyway_device_probe,

	.remove		= superhyway_device_remove,

include/linux/superhyway.h

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ int superhyway_add_device(unsigned long base, struct superhyway_device *, struct 
int superhyway_add_devices(struct superhyway_bus *bus, struct superhyway_device **devices, int nr_devices);



/* drivers/sh/superhyway/superhyway-sysfs.c */

extern struct device_attribute superhyway_dev_attrs[];

extern const struct attribute_group *superhyway_dev_groups[];



#endif /* __LINUX_SUPERHYWAY_H */