From 9da2f1a970b6cb53ca6afa7cdf4783e825fd966e Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Sat, 21 Jan 2012 11:02:28 -0800 Subject: [PATCH] --- yaml --- r: 286951 b: refs/heads/master c: 4f4ffe52e1e5ddb9708fe075aaef4424f1fb744a h: refs/heads/master i: 286949: 09870aa34bb58d57f4d2183d9b1d408f959a5ef3 286947: aae830a42445e199ab1b9f39f23cd8a65269e7b2 286943: 655a7f6c2441c69fa955e955e9e723a137abd9ea v: v3 --- [refs] | 2 +- trunk/drivers/base/bus.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 76e7655326c6..4a0f7c43bae1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0863b04d1578879173aacbc5c7be749fccb70809 +refs/heads/master: 4f4ffe52e1e5ddb9708fe075aaef4424f1fb744a diff --git a/trunk/drivers/base/bus.c b/trunk/drivers/base/bus.c index 99dc5921e1dd..40fb12288ce2 100644 --- a/trunk/drivers/base/bus.c +++ b/trunk/drivers/base/bus.c @@ -915,9 +915,10 @@ static BUS_ATTR(uevent, S_IWUSR, NULL, bus_uevent_store); /** * __bus_register - register a driver-core subsystem - * @bus: bus. + * @bus: bus to register + * @key: lockdep class key * - * Once we have that, we registered the bus with the kobject + * Once we have that, we register the bus with the kobject * infrastructure, then register the children subsystems it has: * the devices and drivers that belong to the subsystem. */ @@ -1220,8 +1221,8 @@ static void system_root_device_release(struct device *dev) } /** * subsys_system_register - register a subsystem at /sys/devices/system/ - * @subsys - system subsystem - * @groups - default attributes for the root device + * @subsys: system subsystem + * @groups: default attributes for the root device * * All 'system' subsystems have a /sys/devices/system/ root device * with the name of the subsystem. The root device can carry subsystem-