Revert "[LOCAL] base/firmware: return -EPROBE_DEFER until rootfs is available"

This reverts commit 1733ede82e9e964a3d5234ef61979ca523e7ba5a.

Signed-off-by: Christoph Manszewski <c.manszewski@samsung.com>
Change-Id: I30441cbd9b4933cab7e1cb6e80d767e4fca65f41

diff --git a/drivers/base/base.h b/drivers/base/base.h
index eea838c..d800de6 100644 (file)
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -130,6 +130,8 @@ extern void driver_remove_groups(struct device_driver *drv,
 extern char *make_class_name(const char *name, struct kobject *kobj);
 
 extern int devres_release_all(struct device *dev);
+extern void device_block_probing(void);
+extern void device_unblock_probing(void);
 
 /* /sys/devices directory */
 extern struct kset *devices_kset;

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 05f966a..4b57cf5 100644 (file)
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -32,7 +32,6 @@
 #include <linux/syscore_ops.h>
 #include <linux/reboot.h>
 #include <linux/security.h>
-#include <linux/root_dev.h>
 
 #include <generated/utsrelease.h>
 
@@ -393,9 +392,6 @@ fw_get_filesystem_firmware(struct device *device, struct firmware_buf *buf)
        enum kernel_read_file_id id = READING_FIRMWARE;
        size_t msize = INT_MAX;
 
-       if (ROOT_DEV == 0)
-               return -EPROBE_DEFER;
-
        /* Already populated data member means we're loading into a buffer */
        if (buf->data) {
                id = READING_FIRMWARE_PREALLOC_BUFFER;
@@ -1405,9 +1401,6 @@ request_firmware_nowait(
 {
        struct firmware_work *fw_work;
 
-       if (ROOT_DEV == 0)
-               return -EPROBE_DEFER;
-
        fw_work = kzalloc(sizeof(struct firmware_work), gfp);
        if (!fw_work)
                return -ENOMEM;

diff --git a/include/linux/device.h b/include/linux/device.h
index bfe9232..66fe271 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -1239,8 +1239,6 @@ extern int (*platform_notify)(struct device *dev);
 
 extern int (*platform_notify_remove)(struct device *dev);
 
-extern void device_block_probing(void);
-extern void device_unblock_probing(void);
 
 /*
  * get_device - atomically increment the reference count for the device.

diff --git a/init/do_mounts.c b/init/do_mounts.c
index fceda2f..7cf4f6d 100644 (file)
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -375,8 +375,6 @@ static int __init do_mount_root(char *name, char *fs, int flags, void *data)
               s->s_type->name,
               sb_rdonly(s) ? " readonly" : "",
               MAJOR(ROOT_DEV), MINOR(ROOT_DEV));
-       device_block_probing();
-       device_unblock_probing();
        return 0;
 }