AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

staging: unisys: Properly move version file into bus attr

Browse Source 
Simplify things by moving the version file handling into the core.

Signed-off-by: Don Zickus <dzickus@redhat.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Don Zickus 2015-05-13 13:22:15 -04:00 committed by Greg Kroah-Hartman
parent f3aa5fe83f
commit 68b04f1f34
1 changed files with 30 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
drivers/staging/unisys/visorbus/visorbus_main.c
View File

@ -88,6 +88,35 @@ static int visorbus_uevent(struct device *xdev, struct kobj_uevent_env *env);
static int visorbus_match(struct device *xdev, struct device_driver *xdrv);
static void fix_vbus_dev_info(struct visor_device *visordev);
/* BUS type attributes
*
* define & implement display of bus attributes under
* /sys/bus/visorbus.
*
*/
static ssize_t version_show(struct bus_type *bus, char *buf)
{
return snprintf(buf, PAGE_SIZE, "%s\n", VERSION);
}
static BUS_ATTR_RO(version);
static struct attribute *visorbus_bus_attrs[] = {
&bus_attr_version.attr,
NULL,
};
static const struct attribute_group visorbus_bus_group = {
.attrs = visorbus_bus_attrs,
};
const struct attribute_group *visorbus_bus_groups[] = {
&visorbus_bus_group,
NULL,
};
/** This describes the TYPE of bus.
* (Don't confuse this with an INSTANCE of the bus.)
*/
@ -95,6 +124,7 @@ static struct bus_type visorbus_type = {
.name = "visorbus",
.match = visorbus_match,
.uevent = visorbus_uevent,
.bus_groups = visorbus_bus_groups,
};
static struct delayed_work periodic_work;
@ -609,37 +639,6 @@ void unregister_channel_attributes(struct visor_device *dev)
#define to_visorbus_devdata(obj) \
container_of(obj, struct visorbus_devdata, dev)
/* BUS type attributes
*
* define & implement display of bus attributes under
* /sys/bus/visorbus.
*
*/
static ssize_t
BUSTYPE_ATTR_version(struct bus_type *bus, char *buf)
{
return snprintf(buf, PAGE_SIZE, "%s\n", VERSION);
}
static struct bus_attribute bustype_attr_version =
__ATTR(version, S_IRUGO, BUSTYPE_ATTR_version, NULL);
static int
register_bustype_attributes(void)
{
int rc = 0;
rc = bus_create_file(&visorbus_type, &bustype_attr_version);
return rc;
}
static void
unregister_bustype_attributes(void)
{
bus_remove_file(&visorbus_type, &bustype_attr_version);
}
/* BUS instance attributes
*
* define & implement display of bus attributes under
@ -1580,10 +1579,6 @@ create_bus_type(void)
visorbus_type.dev_attrs = visor_device_attrs;
rc = bus_register(&visorbus_type);
if (rc < 0)
return rc;
rc = register_bustype_attributes();
return rc;
}
@ -1592,7 +1587,6 @@ create_bus_type(void)
static void
remove_bus_type(void)
{
unregister_bustype_attributes();
bus_unregister(&visorbus_type);
}