Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[linux-2.6-microblaze.git] / drivers / base / core.c

diff --git a/drivers/base/core.c b/drivers/base/core.c
index c3064ff..8dde934 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -981,12 +981,9 @@ out:
 static ssize_t uevent_store(struct device *dev, struct device_attribute *attr,
                            const char *buf, size_t count)
 {
-       enum kobject_action action;
+       if (kobject_synth_uevent(&dev->kobj, buf, count))
+               dev_err(dev, "uevent: failed to send synthetic uevent\n");
 
-       if (kobject_action_type(buf, count, &action) == 0)
-               kobject_uevent(&dev->kobj, action);
-       else
-               dev_err(dev, "uevent: unknown action-string\n");
        return count;
 }
 static DEVICE_ATTR_RW(uevent);