From: Greg Kroah-Hartman Date: Sat, 22 Jul 2017 10:00:15 +0000 (+0200) Subject: Merge branch 'bind_unbind' into driver-core-next X-Git-Tag: rel_imx_4.19.35_1.1.0~11811^2~16 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=1af824f085e813e06548212b18bbc788b16f60e6;p=linux.git Merge branch 'bind_unbind' into driver-core-next This merges the bind_unbind driver core feature into the driver-core-next branch. bind_unbind is a branch so that others can pull and work off of it safely. Signed-off-by: Greg Kroah-Hartman --- 1af824f085e813e06548212b18bbc788b16f60e6 diff --cc lib/kobject_uevent.c index 719c155fce20,4682e8545b5c..e590523ea476 --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c @@@ -52,15 -50,23 +52,17 @@@ static const char *kobject_actions[] = [KOBJ_MOVE] = "move", [KOBJ_ONLINE] = "online", [KOBJ_OFFLINE] = "offline", + [KOBJ_BIND] = "bind", + [KOBJ_UNBIND] = "unbind", }; -/** - * kobject_action_type - translate action string to numeric type - * - * @buf: buffer containing the action string, newline is ignored - * @count: length of buffer - * @type: pointer to the location to store the action type - * - * Returns 0 if the action string was recognized. - */ -int kobject_action_type(const char *buf, size_t count, - enum kobject_action *type) +static int kobject_action_type(const char *buf, size_t count, + enum kobject_action *type, + const char **args) { enum kobject_action action; + size_t count_first; + const char *args_start; int ret = -EINVAL; if (count && (buf[count-1] == '\n' || buf[count-1] == '\0'))