Merge tag 'driver-core-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / amba / bus.c

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 3a2adea..0e3ed5e 100644 (file)
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -98,31 +98,11 @@ static ssize_t driver_override_store(struct device *_dev,
                                     const char *buf, size_t count)
 {
        struct amba_device *dev = to_amba_device(_dev);
-       char *driver_override, *old, *cp;
-
-       /* We need to keep extra room for a newline */
-       if (count >= (PAGE_SIZE - 1))
-               return -EINVAL;
-
-       driver_override = kstrndup(buf, count, GFP_KERNEL);
-       if (!driver_override)
-               return -ENOMEM;
-
-       cp = strchr(driver_override, '\n');
-       if (cp)
-               *cp = '\0';
-
-       device_lock(_dev);
-       old = dev->driver_override;
-       if (strlen(driver_override)) {
-               dev->driver_override = driver_override;
-       } else {
-               kfree(driver_override);
-               dev->driver_override = NULL;
-       }
-       device_unlock(_dev);
+       int ret;
 
-       kfree(old);
+       ret = driver_set_override(_dev, &dev->driver_override, buf, count);
+       if (ret)
+               return ret;
 
        return count;
 }